As it has been 9 months since i branched off dev/rune I tried to merge
master into dev/rune to test how it went.
I did
$ git checkout dev/rune
$ git pull --no-commit . master
And then I was flooded with conflicts.
Many conflicts was in files that I did not even change.
How could this happen, and what can I do about it?
(I branched off from 7cfd1d6da86bf8c2eb6391592c84ea361c35ca6d. I have
only changed 24 files. After pull master I had conflicts in almost all
files.)
-Rune
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
