Jump to content

Cannot Merge Manually


esthrim

Recommended Posts

HI, 

 

when i want to merge from another branch, i want to merge manually, and i already choose "always merge manually" in the preferences windows (merge options).

 

but when i click the process button, it always merge automatically.

 

am i missing something? or is  it a bug ?

Link to comment
Share on other sites

Hi Manu,

 

Sorry for late reply, i already set the preference like the picture, but it still merge automatically.

 

I found that the merge title is changed only on source, automatic merge. Please see the image attached.

 

post-2363-0-44542500-1415948106_thumb.png

 

My problem is, there are lines from the source which i don't want to be merged.

 

 

 

Link to comment
Share on other sites

Ok, those kind of conflicts are always automatic, merge tool is not started.

 

But you can do the following, after the merge go to the items view, perform a checkout operation for the merged file, then go to the pending changes view, you will see that the embedded differences are showing small arrows to override block differences.

Link to comment
Share on other sites

Archived

This topic is now archived and is closed to further replies.

×
×
  • Create New...