[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Problem with git push

From: Reinhold Kainhofer
Subject: Re: Problem with git push
Date: Thu, 22 Sep 2011 15:45:28 +0200
User-agent: KMail/1.13.6 (Linux/2.6.38-11-generic; KDE/4.7.0; i686; ; )

Am Donnerstag, 22. September 2011, 15:30:14 schrieb Phil Holmes:
> That's what it appears to mean - but since I've done all the commands that
> should reset my git to be exactly the same as master, then done a 3 line
> change to lily/GNUmakefile, I can't see how there can actually be a
> conflict.

As a quick check, look at the commit tree in a graphical UI like qgit or gitk. 
That will tell you whether your local master branch is really a successor to 


Reinhold Kainhofer, address@hidden,
 * Financial & Actuarial Math., Vienna Univ. of Technology, Austria
 *, DVR: 0005886
 * LilyPond, Music typesetting,

reply via email to

[Prev in Thread] Current Thread [Next in Thread]