Bazaar

Unwanted strings after merge

Asked by riccardoventrella

Hi,
I've changed the merge app for using tortoisemerge. I cannot handle correctly the metargs to be passed
to this app, so I simply put "tortoisemerge" in my config entry ) otherwise a error usually occurs.

However it seems to work, openign the these, mine and merge windows ( the base one is not there, but I think
it should ne enough we these 3 ones ).
After having merged and tagged as resolved, I see within the sources usually appear these strings:

>>>>>>> MERGE-SOURCE
<<<<<<< TREE

ans some =======

It seems these rows are inserted by default by bazaar, 'cause I got the same behaviour using winmerge,
so it's not the merging tool but its caller.

As you may see, being the sources in plain C syntax, these rows creates some problems with the compiler.
Is there a way to avoid bazaar to add these strings? Or is there a way customize them, putting some // in front
of them before they are appended?

Thank you for you gentle answers.

Ricky

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Martin Pool (mbp) said : 		#1

Hi Ricky,

These markers are indeed inserted by bzr. They indicate that conflicting changes have been made to the file by the two branches being merged. You need to look at the changes and decide to either take one or the other or to combine them.

It's actually a feature that this won't compile as C, because it's probably not a correct program until the changes are resolved.

Can you help with this problem?

Provide an answer of your own, or ask riccardoventrella for more information if necessary.

To post a message you must log in.