Hello,
I did a 'bzr update' in my Ikarus repository today:
/src/ikarus.dev # bzr update
M .bzrignore
M Makefile.in
M aclocal.m4
M benchmarks/Makefile.in
M c32
M c64
M config.h.in
M configure
M doc/Makefile.in
M lib/Makefile.in
M scheme/Makefile.in
M scheme/last-revision
M src/Makefile.in
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.
Updated to revision 1852.
/src/ikarus.dev #
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?
Thanks for any suggestions!
Ed
