Am Sunday, 21. August 2011, 23:43:21 schrieb Janek Warchoł: > janek@janek-lilydev5:~/lilypond-git$ git status > ##now this looks strange - shouldn't it say something like "modified: > this, this and this"?
Nope, after you manually resolved all conflicts of the rebase, the conflicting patch does not have any changes left (because you removed everything that the patch would have changed). So you can't say "git rebase --continue", because there is nothing in that patch any more. You rather have to skip this with "git rebase --skip", because in git you can't[*] have a commit without any changes. Cheers, Reinhold [*] It is possible to have a commit without any changes, but I don't know any situation where you really want it. And you have to force git to create such a commit. -- ------------------------------------------------------------------ Reinhold Kainhofer, reinh...@kainhofer.com, http://reinhold.kainhofer.com/ * Financial & Actuarial Math., Vienna Univ. of Technology, Austria * http://www.fam.tuwien.ac.at/, DVR: 0005886 * LilyPond, Music typesetting, http://www.lilypond.org _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
