I get a lot of merge errors, after the git-pull:
git-rev-parse web/master
745ee84ea5b583686e53dc2628e5067492997773
[EMAIL PROTECTED]: lilypond]$ git pull
git://git.sv.gnu.org/lilypond.git/ web/master:web/master
Trying really trivial in-index merge...
es/sponsor/index.html: needs merge
es/sponsor/options.html: needs merge
es/switch/howto.html: needs merge
fatal: you need to resolve your current index first
Nope.
Merging HEAD with 745ee84ea5b583686e53dc2628e5067492997773
Merging:
afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f message
745ee84ea5b583686e53dc2628e5067492997773 Resolving conflicts with
[EMAIL PROTECTED]:/srv/git/lilypond.git#web/master
found 1 common ancestor(s):
ac5da2c7e90f10ce8a680b275d1e33b10462c4ea Merge branch 'web/master' of
git://git.sv.gnu.org/lilypond into web/master
git-read-tree: fatal: you need to resolve your current index first
No merge strategy handled the merge.
git-rev-list shows one thing, and git-rev-parse another:
git-rev-list HEAD | head -1
afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f
git-rev-parse web/master
745ee84ea5b583686e53dc2628e5067492997773
Which would be the best way to handle this?
Should I just start over?
Daniel Tonda C.
begin:vcard
fn:Daniel Tonda Castillo
n:Tonda Castillo;Daniel
email;internet:[EMAIL PROTECTED]
version:2.1
end:vcard
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
