Eduardo Cavazos wrote:
Text conflict in benchmarks/Makefile.in Text conflict in doc/Makefile.in Text conflict in lib/Makefile.in Text conflict in scheme/Makefile.in Text conflict in src/Makefile.in 5 conflicts encountered.
Just curious, how do y'all avoid these conflicts? Perhaps I should run one of the make rules before updating? Maybe there should be a 'make update' which does the right thing?
Oh and... is there an easy way to automatically resolve these via some bzr command as opposed to manually fixing the conflicts?
Ed
