- Original Message -
From: "Janek Warchoł"
To: "Phil Holmes"
Cc: "Reinhold Kainhofer" ;
Sent: Thursday, September 22, 2011 4:20 PM
Subject: Re: Problem with git push
2011/9/22 Phil Holmes :
- Original Message - From: "Phil Holmes&q
2011/9/22 Phil Holmes :
> - Original Message - From: "Phil Holmes"
> To: "Reinhold Kainhofer" ;
> Sent: Thursday, September 22, 2011 3:28 PM
> Subject: Re: Problem with git push
>
>
>> - Original Message - From: "Reinhold K
- Original Message -
From: "Phil Holmes"
To: "Reinhold Kainhofer" ;
Sent: Thursday, September 22, 2011 3:28 PM
Subject: Re: Problem with git push
- Original Message -
From: "Reinhold Kainhofer"
Simply fetch from the server:
git pull --reb
- Original Message -
From: "Reinhold Kainhofer"
Simply fetch from the server:
git pull --rebase
Well, I was sure I must have done that at one point, but I've done it now
and success :-) Thanks Reinhold.
--
Phil Holmes
___
lilypond-d
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.
Am Donnerstag, 22. September 2011, 13:44:20 schrieb Phil Holmes:
> On my new machine, I get:
>
> phil@Ubuntu:~/lilypond-git$ git push --dry-run
> To ssh://philhol...@git.sv.gnu.org/srv/git/lilypond.git
> ! [rejected]master -> master (non-fast-forward)
> error: failed to push some refs to
- Original Message -
From: "Janek Warchoł"
To: "Phil Holmes"
Cc: "Bertrand Bordage" ; "David Kastrup"
;
Sent: Thursday, September 22, 2011 2:05 PM
Subject: Re: Problem with git push
2011/9/22 Phil Holmes :
I've just used lily-gi
2011/9/22 Phil Holmes :
> I've just used lily-git to do a hard reset of my git, reapplied the changes,
> recommitted and redone the push --dry-run and am still getting the same
> error. I'm not quite sure what it means for "commit you want to push must
> follow origin/master" but it's definitely t
e sole commit which is on the latest
version of master.
--
Phil Holmes
- Original Message -
From: Bertrand Bordage
To: Phil Holmes
Cc: lilypond-devel@gnu.org ; David Kastrup
Sent: Thursday, September 22, 2011 1:40 PM
Subject: Re: Problem with git push
The commit you
The commit you want to push must follow origin/master.
If it does, just do:
git push --dry-run origin [hash_of_the_commit]:master
This will push this single commit.
If not, you have to rebase so that the commit follows origin/master:
git rebase -i origin
An editor opens, where you can change the
I'm just trying to push a single commit on master.
--
Phil Holmes
- Original Message -
From: Bertrand Bordage
To: Phil Holmes
Cc: lilypond-devel@gnu.org ; David Kastrup
Sent: Thursday, September 22, 2011 1:13 PM
Subject: Re: Problem with git push
You can specify
You can specify what you want to push:
git push --dry-run origin [hash]:[branch]
This will push every commit between [hash] and origin, assuming we stay in
[branch].
Bertrand
___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/
- Original Message -
From: "David Kastrup"
To:
Sent: Thursday, September 22, 2011 12:56 PM
Subject: Re: Problem with git push
"Phil Holmes" writes:
- Original Message -
From: "Phil Holmes"
To: "Devel"
Sent: Thursday, September
"Phil Holmes" writes:
> - Original Message -
> From: "Phil Holmes"
> To: "Devel"
> Sent: Thursday, September 22, 2011 12:44 PM
> Subject: Problem with git push
>
>
>> On my new machine, I get:
>>
>> phil@Ubuntu:~/l
- Original Message -
From: "Phil Holmes"
To: "Devel"
Sent: Thursday, September 22, 2011 12:44 PM
Subject: Problem with git push
On my new machine, I get:
phil@Ubuntu:~/lilypond-git$ git push --dry-run
To ssh://philhol...@git.sv.gnu.org/srv/git/lily
On my new machine, I get:
phil@Ubuntu:~/lilypond-git$ git push --dry-run
To ssh://philhol...@git.sv.gnu.org/srv/git/lilypond.git
! [rejected]master -> master (non-fast-forward)
error: failed to push some refs to
'ssh://philhol...@git.sv.gnu.org/srv/git/lilypond.git'
To prevent you from
16 matches
Mail list logo
