Merging a single file?

[Thomas Williams]

Hi,

I've been using your product for a while now and I'm loving it. I do have one question, however: When merging, if another developer and I are working on the same file, it causing a conflict and we have to choose one or the other and one of us will end up losing the work. Is there a way to merge a single file into itself and keep both developers changes?

Thank you for any help!

[stevestreeting]

Sure, when you merge (so after you've pulled changes and either have 2 heads in Mercurial which you merge, or in git if the merge has already got conflicts), just right-click on a file which has conflicts and select 'Resolve Conflicts > Launch External Merge Tool'. The default is FileMerge, and you can then go through each change and resolve the merge by combining the changes or choosing one or the other in each case within the file.