Are there any good tools for merging/resolving conflicts for Bazaar + Eclipse?
I wish Bazaar was integrated with Eclipse the same way Subversion is.
A:
Have you seen Bzr-Eclipse and QBzr-Eclipse? I think it's an either-or choice: don't install both. Bzr-Eclipse uses it's own interface, so it looks closer to the Eclipse way of doing things. QBzr-Eclipse links in to QBzr's dialog boxes, so it looks like Bazaar Explorer and is probably better maintained (this link). I prefer QBzr-Eclipse, but it's up to you: try them both and see how you get on.
There are some Bzr Eclipse screenshots here.
Al
2009-12-02 15:55:04