Jump to content

Feature request: merge functionality in add/move dialog


jmranger

Recommended Posts

Wow. It looks like I'm really in "request" mode today.

 

In the "add/move" dialog (trying to merge from a different branch, and for the same file name, one branch contains a new file and the other a moved file), it would be nice to have a merge option in addition to the acual keep-old/keep-new/keep-both-and-rename-one.

 

I understand that given the lack of common ancestor, all conflicts will have to be resolved manually. Still, it would be easier than doing the merge without the assistance of a merge tool.

 

I also understand that very few users ever encounter this situation, severely limiting the importance of this request.

 

Best regards,

 

Jean-Marc

Link to comment
Share on other sites

Archived

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

×
×
  • Create New...