On Sep 2, 2009, at 10:30 PM, Eduardo Cavazos wrote:
Oh and... is there an easy way to automatically resolve these via some bzr command as opposed to manually fixing the conflicts?
bzr revert should do it, but I'm still curious as to why you get these in the first place.
Aziz,,,
