On Wed, 2009-09-02 at 14:30 -0500, Eduardo Cavazos wrote: > 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?
Yes, 'bzr resolve --all' just did it for me. $ bzr help resolve Purpose: Mark a conflict as resolved. Usage: bzr resolve [FILE...] Options: --all Resolve all conflicts in this tree. -v, --verbose Display more information. -q, --quiet Only display errors and warnings. -h, --help Show help message. Description: Merge will do its best to combine the changes in two branches, but there are some kinds of problems only a human can fix. When it encounters those, it will mark a conflict. A conflict means that you need to fix something, before you should commit. Once you have fixed a problem, use "bzr resolve" to automatically mark text conflicts as fixed, resolve FILE to mark a specific conflict as resolved, or "bzr resolve --all" to mark all conflicts as resolved. See also bzr conflicts. Aliases: resolved -- : Derick ----------------------------------------------------------------
