Sometimes, after we update our files from repository, we’ll meet this problem.

If you open file, you will find it’s hard to understand and correct them.

<<<<<<< .mine
3 modifuy=======
2 modify>>>>>>> .r288

?

In fact, TortoiseSVN provides a good tool to help us resolve this issue. First, we need to Edit conflicts.

There are three working regions, the left is from repository, the right is from my working file. the bottom you know, it’s the last result after your editing.

I click one line and click right button of mouse, look here is context menu . You can choose to use this block or merge yours into the file,

The merge result was changed according my decision. I click save and check the content of file in my PC, now it have been changed. But the flag of conflict still exist.

Now, we click resolved.and now we can commit successfully.

?

?

轉(zhuǎn)載于:https://www.cnblogs.com/king_astar/archive/2010/03/03/1677042.html

與50位技術(shù)專(zhuān)家面對(duì)面20年技術(shù)見(jiàn)證，附贈(zèng)技術(shù)全景圖

總結(jié)

以上是生活随笔為你收集整理的How to resolve conflicts in TortoiseSVN的全部?jī)?nèi)容，希望文章能夠幫你解決所遇到的問(wèn)題。

如果覺(jué)得生活随笔網(wǎng)站內(nèi)容還不錯(cuò)，歡迎將生活随笔推薦給好友。