[GRASS-dev] instructions to update my local copy of trunk

[Markus Neteler]

On Sun, Jun 2, 2019 at 10:23 PM Markus Metz
<markus.metz.giswork at gmail.com> wrote:
> On Sun, Jun 2, 2019 at 8:59 PM Veronica Andreo <veroandreo at gmail.com> wrote:
...
> > Why does my origin/master is now ahead by 51 commits, if I have not a single local change?
>
> Read carefully: "Your branch is ahead of 'origin/master' by 51 commits."
> That means your local branch master is ahead of your fork at github: "origin git at github.com:veroandreo/grass.git"
> Your local branch master is based on "upstream git at github.com:OSGeo/grass.git", i.e. the original repo.
> You need to update your fork with something like
> git push origin

OK, let's try:

[mneteler at oboe releasebranch_7_6 ]$ git status
On branch releasebranch_7_6
Your branch is ahead of 'origin/releasebranch_7_6' by 7 commits.
  (use "git push" to publish your local commits)

[mneteler at oboe releasebranch_7_6 ]$ git push origin
Enumerating objects: 31, done.
Counting objects: 100% (31/31), done.
Delta compression using up to 4 threads
Compressing objects: 100% (18/18), done.
Writing objects: 100% (18/18), 1.97 KiB | 1.97 MiB/s, done.
Total 18 (delta 14), reused 0 (delta 0)
remote: error: refusing to update checked out branch:
refs/heads/releasebranch_7_6
remote: error: By default, updating the current branch in a non-bare repository
remote: is denied, because it will make the index and work tree inconsistent
remote: with what you pushed, and will require 'git reset --hard' to match
remote: the work tree to HEAD.
remote:
remote: You can set the 'receive.denyCurrentBranch' configuration variable
remote: to 'ignore' or 'warn' in the remote repository to allow pushing into
remote: its current branch; however, this is not recommended unless you
remote: arranged to update its work tree to match what you pushed in some
remote: other way.
remote:
remote: To squelch this message and still keep the default behaviour, set
remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.
To /home/mneteler/software/grass-p2/../grass-p3/master
 ! [remote rejected]     releasebranch_7_6 -> releasebranch_7_6
(branch is currently checked out)
error: failed to push some refs to
'/home/mneteler/software/grass-p2/../grass-p3/master'

Meep... more ideas? Cannot be so difficult :-)

thanks
markusN