[Top][All Lists]

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

How to update a remote branch (remotes/origin/dev/guile-v2-work)

From: Thomas Morley
Subject: How to update a remote branch (remotes/origin/dev/guile-v2-work)
Date: Thu, 7 Jun 2018 23:31:40 +0200


as said here
I tried to update the branch dev/guile-v2-work, but failed so far.

I did:

(1) the branch:

$ git branch -a
[ skipping lots of branches ]
[ skipping more remote branches ]

(2) checkout

$ git checkout dev/guile-v2-work
Branch dev/guile-v2-work set up to track remote branch
dev/guile-v2-work from origin.
Switched to a new branch 'dev/guile-v2-work'

(3) updating it

$ git rebase master
[skipping output, resolving merge-conflicts, applying additional patches]

(4) attempt to push in order to make the updates public

$ git push origin HEAD:dev/guile-v2-work
To ssh://address@hidden/srv/git/lilypond.git
 ! [rejected]        HEAD -> dev/guile-v2-work (non-fast-forward)
error: failed to push some refs to
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Obviously I did something wrong.
What would be the correct method?


reply via email to

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