I did a bzr merge, and I always forget what the merge source represents, and what the tree represents.

Which one is my code, and which one comes from the branch I merged with?

1 Answer 1


TREE is the current branch you are on. MERGE-SOURCE is the branch you merged from into the current branch.

Let's say you're on trunk, and you merge from some other branch feature-123 and you get a conflict. If you look at the diff, you might see lines like these:

<<<<<<< TREE
changes you did
in your
current branch
changes others did
in the
other branch
you're merging from

The lines between TREE and ====== are lines that were added in the current branch, trunk. The lines between ======= and MERGE-SOURCE are lines that were added in the other branch, feature-123.


Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge that you have read and understand our privacy policy and code of conduct.

Not the answer you're looking for? Browse other questions tagged or ask your own question.