Dan Eble writes:
> I recently started using a git GUI, GitUp, which sometimes infers that
> I might want to delete origin/staging, and offers to do it for me.
> Needless to say, I don't want that; and I've suggested in the GitUp
> issue tracker that even prompting me is a defect, in the light of
I recently started using a git GUI, GitUp, which sometimes infers that I might
want to delete origin/staging, and offers to do it for me. Needless to say, I
don't want that; and I've suggested in the GitUp issue tracker that even
prompting me is a defect, in the light of this project's
Thomas Morley thomasmorle...@gmail.com writes:
To revert the unwanted merge I did:
git reset --hard HEAD~20
HEAD~20? Huh.
To push:
git fetch
git rebase origin dev/handle-grace
git push origin HEAD:staging
Hope it's ok
Hard to argue with success. As long as you check before
Hi,
as mentioned on the tracker for issue 3508 I'll surely need some help.
For now I performed steps 1-6 from CG
http://lilypond.org/doc/v2.17/Documentation/contributor/commit-access
successfully without any problem, afaics.
Trying step 7:
git pull --verbose
returns:
harm@harm-laptop
Thomas Morley thomasmorle...@gmail.com writes:
Hi,
as mentioned on the tracker for issue 3508 I'll surely need some help.
For now I performed steps 1-6 from CG
http://lilypond.org/doc/v2.17/Documentation/contributor/commit-access
successfully without any problem, afaics.
Trying step 7:
On Tue, Aug 27, 2013 at 01:36:24PM +0200, Thomas Morley wrote:
To be sure: am I right that it will succeed only _after_ Graham
granted membership?
Approved now.
Cheers,
- Graham
___
lilypond-devel mailing list
lilypond-devel@gnu.org
2013/8/27 Graham Percival gra...@percival-music.ca:
On Tue, Aug 27, 2013 at 01:36:24PM +0200, Thomas Morley wrote:
To be sure: am I right that it will succeed only _after_ Graham
granted membership?
Approved now.
Cheers,
- Graham
Thanks!
Afaics, all works and I've push-access.
Next step
- Original Message -
From: Thomas Morley thomasmorle...@gmail.com
To: Graham Percival gra...@percival-music.ca
Cc: lilypond-devel lilypond-devel@gnu.org
Sent: Tuesday, August 27, 2013 1:32 PM
Subject: Re: push-access
2013/8/27 Graham Percival gra...@percival-music.ca:
On Tue, Aug 27
Phil Holmes m...@philholmes.net writes:
- Original Message -
From: Thomas Morley thomasmorle...@gmail.com
To: Graham Percival gra...@percival-music.ca
Cc: lilypond-devel lilypond-devel@gnu.org
Sent: Tuesday, August 27, 2013 1:32 PM
Subject: Re: push-access
2013/8/27 Graham
!
Afaics, all works and I've push-access.
Next step: I'll reread CG _how_ to push.
:)
Best,
Harm
Actually trying to push I followed CG and did
git checkout staging
git pull -r
git merge dev/handle-grace
Now an editor pops up with:
Merge branch 'dev/handle-grace' into staging
# Please
membership?
Approved now.
Cheers,
- Graham
Thanks!
Afaics, all works and I've push-access.
Next step: I'll reread CG _how_ to push.
:)
Best,
Harm
Actually trying to push I followed CG and did
git checkout staging
git pull -r
git merge dev/handle-grace
Uh what? So much for stating
that it will succeed only _after_ Graham
granted membership?
Approved now.
Cheers,
- Graham
Thanks!
Afaics, all works and I've push-access.
Next step: I'll reread CG _how_ to push.
:)
Best,
Harm
Actually trying to push I followed CG and did
git checkout staging
git pull -r
git merge dev/handle
wrote:
To be sure: am I right that it will succeed only _after_ Graham
granted membership?
Approved now.
Cheers,
- Graham
Thanks!
Afaics, all works and I've push-access.
Next step: I'll reread CG _how_ to push.
:)
Best,
Harm
Actually trying to push I followed CG and did
git
On Tue, Aug 27, 2013 at 09:42:37PM +0200, David Kastrup wrote:
Thomas Morley thomasmorle...@gmail.com writes:
Actually trying to push I followed CG and did
git checkout staging
git pull -r
git merge dev/handle-grace
Uh what? So much for stating that CG is our best reference.
The
- Original Message -
From: James pkx1...@gmail.com
To: Devel lilypond-devel@gnu.org
Sent: Monday, December 26, 2011 1:15 AM
Subject: Keep getting permission denied on pull and push access
Hello,
I've had problems getting permission access to push using my new
install of LilyDev2.
I
Phil, thanks...
On 26 December 2011 11:59, Phil Holmes m...@philholmes.net wrote:
- Original Message - From: James pkx1...@gmail.com
...
Here are the relevant files/information:
--snip--
james@jameslilydev2:~/lilypond-git$ git pull --verbose
Permission denied (publickey).
fatal:
On Mon, Dec 26, 2011 at 06:21:35PM +, James wrote:
debug1: Next authentication method: publickey
debug1: Offering public key: /home/james/.ssh/id_rsa
shouldn't that be id_rsa.pub ?
debug1: Authentications that can continue: publickey
debug1: Trying private key: /home/james/.ssh/identity
Graham,
On 26 December 2011 18:30, Graham Percival gra...@percival-music.ca wrote:
On Mon, Dec 26, 2011 at 06:21:35PM +, James wrote:
debug1: Next authentication method: publickey
debug1: Offering public key: /home/james/.ssh/id_rsa
shouldn't that be id_rsa.pub ?
debug1:
James pkx1...@gmail.com writes:
debug1: expecting SSH2_MSG_NEWKEYS
debug1: SSH2_MSG_NEWKEYS received
debug1: SSH2_MSG_SERVICE_REQUEST sent
debug1: SSH2_MSG_SERVICE_ACCEPT received
debug1: Authentications that can continue: publickey
debug1: Next authentication method: publickey
debug1:
On Mon, Dec 26, 2011 at 06:33:20PM +, James wrote:
james@jameslilydev2:~/lilypond-git$ ls -al /home/james/.ssh/
total 20
drwx-- 2 james james 4096 2011-12-26 18:17 .
drwxr-xr-x 37 james james 4096 2011-12-26 18:15 ..
-rw--- 1 james james 1743 2011-12-26 18:15 id_rsa
-rw-r--r--
James pkx1...@gmail.com writes:
Graham,
On 26 December 2011 18:30, Graham Percival gra...@percival-music.ca wrote:
On Mon, Dec 26, 2011 at 06:21:35PM +, James wrote:
debug1: Next authentication method: publickey
debug1: Offering public key: /home/james/.ssh/id_rsa
shouldn't that be
Graham,
On 26 December 2011 18:42, Graham Percival gra...@percival-music.ca wrote:
On Mon, Dec 26, 2011 at 06:33:20PM +, James wrote:
james@jameslilydev2:~/lilypond-git$ ls -al /home/james/.ssh/
total 20
drwx-- 2 james james 4096 2011-12-26 18:17 .
drwxr-xr-x 37 james james 4096
On Mon, Dec 26, 2011 at 06:50:11PM +, James wrote:
Well that was the first thing I thought. I have copied this from the
terminal and when that didn't work I deleted my whole /.ssh dir,
deleted the key from savannah, waited an hour and then redid the whole
process (get a new key, paste it
Hello,
On 26 December 2011 18:54, Graham Percival gra...@percival-music.ca wrote:
On Mon, Dec 26, 2011 at 06:50:11PM +, James wrote:
Well that was the first thing I thought. I have copied this from the
terminal and when that didn't work I deleted my whole /.ssh dir,
deleted the key from
Hello,
I've had problems getting permission access to push using my new
install of LilyDev2.
I moved over and was able to pull with no problems but then I realised
I needed to set up for push access, and followed (as normal) the CG
steps for setting up a public key and testing for pull and push
25 matches
Mail list logo
