[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[TSVN] Merge conflict: include both files

From: JosÚ Vilaša <jose.vilaca_at_paradigmaxis.pt>
Date: 2005-01-24 19:55:12 CET


When merging two files into a third one, I came to a point where I wanted to
include lines from both sides. Two functions were placed in the middle of
the file, and TortoiseMerge considered them a conflict and expected me to
choose one of the blocks (or parts of it). This forced me to go into notepad
to solve the conflict as the lines of one partially overlapped lines of the

I was wondering how complex it is to allow the inclusion of both source
files into the merged file to cover these cases where those changes are

Thanks for a great tool!

Jose Vilaca

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jan 24 20:08:21 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.