SVN how to resolve conflicts

1. First of all, no matter what problems arise, it is certainly a reason, there is no question there is no reason, for example, you pull the latest code, then later modified to compile complete and submit the compiled files to the server, but suddenly found the page or the previous look, there is no change, then you continue to pull the code, recompile continues, continue to upload, repeated but found no effect, we must learn to locate the problem.

2. I was doing front-end, so you have to find the page to find the problem, find those remarks would like to change, and then to find this passage in the resource file that contains the file, or picture, and then go to the file after you do compile in contrast, look at the two are not the same, if it is the same, it means that your compiler does not play any role.

3. So I thought why compiler does not work, feel a habit sorcetree this software really is not very good, SVN has this conflict are willing to see, and finally found the code to pull the conflict, the conflict turned out to have the code can submit up, I was served, there is a conflict of code, compile certainly not successful, but there is no error, it could not find the cause, then we talk about solutions.

1. If you change something less, I suggest you pull the success of the code you last commit, then copy you write something into the like

2. The second approach I will not, I will only version rollback

Guess you like

Origin www.cnblogs.com/zhangwq103/p/11594094.html