Originally Posted by
OutOfReach
Conflicts are such a pain. Even when I use bzr resolve it still leaves some ====TREE things in some files, really annoying.
I'm not sure what you're doing, but here's how I handle conflicts. For the sake of this post, let's assume that the conflict is in changelog (which is where they seem to crop up the most for me).
Code:
meld changelog.*
# meld will show you a three-way diff, which you can use to determine what should
# happen. Usually, *.OTHER is the proper file to use. Meld allows editing in case that
# should be necessary.
# Assuming you're resolving in favor of changelog.OTHER (possibly with some edits):
mv changelog{.OTHER,}
bzr resolve changelog
And you're done...unless you have more conflicts to resolve.
Bookmarks