Hi, On Sun, Jun 2, 2019 at 8:59 PM Veronica Andreo <[email protected]> wrote: > > Hi devs > > Following instructions here: > https://trac.osgeo.org/grass/wiki/HowToGit#Keepyourlocalsourcecodeuptodate, I > get: [...] > [veroandreo@localhost grass7_trunk]$ git status > On branch master > Your branch is ahead of 'origin/master' by 51 commits. > (use "git push" to publish your local commits) > > Why does my origin/master is now ahead by 51 commits, if I have not a single > local change? I just want to get the new stuff from upstream and update my > fork and local copy of the source code (what I used to do with `svn update`). > > Can someone please provide full instructions [ideally in > https://trac.osgeo.org/grass/wiki/HowToGit#Keepyourlocalsourcecodeuptodate]?
I have pretty much the same issue on the GRASS Server, trying to update the cronjobs: # here on relbranch76: neteler@osgeo6:~/cronjobs$ sh cron_grass76_src_relbr76_snapshot.sh Sun Jun 2 12:33:42 PDT 2019 Already on 'releasebranch_7_6' Your branch is up-to-date with 'origin/releasebranch_7_6'. git update... From https://github.com/OSGeo/grass * branch releasebranch_7_6 -> FETCH_HEAD Updating 2340b9d..dcfce28 Fast-forward README => README.md | 78 +++++++++++++++++++++++++++++++++++++++++++++++------------------------------ doc/howto_release.txt | 3 +-- include/Make/Docs.make | 10 +++------- lib/python/pygrass/modules/grid/grid.py | 7 +++++++ raster/r.stream.extract/main.c | 6 +++--- tools/gitlog2changelog.py | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ vector/v.db.connect/main.c | 24 +++++++++++++----------- 7 files changed, 208 insertions(+), 53 deletions(-) rename README => README.md (51%) create mode 100755 tools/gitlog2changelog.py On branch releasebranch_7_6 Your branch is ahead of 'origin/releasebranch_7_6' by 6 commits. (use "git push" to publish your local commits) nothing to commit, working directory clean Something is clearly missing in the "HowToGit"... Help welcome. thanks Markus _______________________________________________ grass-dev mailing list [email protected] https://lists.osgeo.org/mailman/listinfo/grass-dev
