2011/8/22 Reinhold Kainhofer :
> 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 th
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 n
Hi,
I don't understand what happens (and why) when i try to update one of
my local branches.
Here's the background: i made a branch and applied a patch done by
Keith to it. Later a modified version of Keith's patch was pushed to
origin/master (i guess). Now I try to pull and rebase and a conflic
