<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, Jun 2, 2019 at 9:01 PM Veronica Andreo <<a href="mailto:veroandreo@gmail.com">veroandreo@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div>Ok, got it... the `git push origin` put my origin in sync with upstream. So, for the way we have set remote/origin and remote/upstream, the update goes from upstream to local and from local to origin, is that right?</div></div></blockquote><div><br></div><div>Right.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div> Is there another way? I would have imagined, dunno why, that the update would go from upstream to origin to local...<br></div></div></blockquote><div><br></div><div>That would have to happen on GitHub. For whatever reason GitHub does not help you to do this automatically (I guess for case when one wants to use different workflow...).<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div></div><div>In any case to update my local copy and recompile the source code, I could ommit the git push origin for now, though I'll need it eventually if I make local changes myself. <br></div></div></blockquote><div><br></div><div>If you are creating a new branch locally, you want your local master up to date, if on GitHub, you need also your origin/master up to date.<br></div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">El dom., 2 jun. 2019 a las 22:23, Markus Metz (<<a href="mailto:markus.metz.giswork@gmail.com" target="_blank">markus.metz.giswork@gmail.com</a>>) escribió:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><br><br>On Sun, Jun 2, 2019 at 8:59 PM Veronica Andreo <<a href="mailto:veroandreo@gmail.com" target="_blank">veroandreo@gmail.com</a>> wrote:<br>><br>> Hi devs<br>><br>> Following instructions here: <a href="https://trac.osgeo.org/grass/wiki/HowToGit#Keepyourlocalsourcecodeuptodate" target="_blank">https://trac.osgeo.org/grass/wiki/HowToGit#Keepyourlocalsourcecodeuptodate</a>, I get:<br>><br>> [veroandreo@localhost grass7_trunk]$ git remote -v<br>> origin git@github.com:veroandreo/grass.git (fetch)<br>> origin git@github.com:veroandreo/grass.git (push)<br>> upstream git@github.com:OSGeo/grass.git (fetch)<br>> upstream git@github.com:OSGeo/grass.git (push)<br>><br>> [veroandreo@localhost grass7_trunk]$ git fetch upstream<br>> remote: Enumerating objects: 242, done.<br>> remote: Counting objects: 100% (242/242), done.<br>> remote: Compressing objects: 100% (25/25), done.<br>> remote: Total 296 (delta 223), reused 233 (delta 217), pack-reused 54<br>> Receiving objects: 100% (296/296), 56.83 KiB | 1.18 MiB/s, done.<br>> Resolving deltas: 100% (226/226), completed with 105 local objects.<br>> From github.com:OSGeo/grass<br>> * [new branch] changelog_fix_msg -> upstream/changelog_fix_msg<br>> 3797ccaaf..b300e66fc master -> upstream/master<br>> 1ca5e4e34..e1e13d782 releasebranch_7_4 -> upstream/releasebranch_7_4<br>> 15f53e803..dcfce280b releasebranch_7_6 -> upstream/releasebranch_7_6<br>><br>> [veroandreo@localhost grass7_trunk]$ git branch -a<br>> * master<br>> remotes/origin/master<br>> remotes/origin/releasebranch_7_0<br>> remotes/origin/releasebranch_7_2<br>> remotes/origin/releasebranch_7_4<br>> remotes/origin/releasebranch_7_6<br>> remotes/upstream/changelog_fix_msg<br>> remotes/upstream/master<br>> remotes/upstream/releasebranch_7_0<br>> remotes/upstream/releasebranch_7_2<br>> remotes/upstream/releasebranch_7_4<br>> remotes/upstream/releasebranch_7_6<br>><br>> [veroandreo@localhost grass7_trunk]$ git rebase upstream/master<br>> First, rewinding head to replay your work on top of it...<br>> Fast-forwarded master to upstream/master.<br>><br>> [veroandreo@localhost grass7_trunk]$ git status<br>> On branch master<br>> Your branch is ahead of 'origin/master' by 51 commits.<br>> (use "git push" to publish your local commits)<br>><br><div>> Why does my origin/master is now ahead by 51 commits, if I have not a single local change?</div><div><br></div><div>Read carefully: "Your branch is ahead of 'origin/master' by 51 commits."</div><div>That means your local branch master is ahead of your fork at github: "origin git@github.com:veroandreo/grass.git"</div><div>Your local branch master is based on "upstream git@github.com:OSGeo/grass.git", i.e. the original repo.</div><div>You need to update your fork with something like</div><div>git push origin<br></div><div><br></div><div>Don't know if that helps,</div><div><br></div><div>Markus M<br></div><div><br></div><div>> 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`).</div>><br>> Can someone please provide full instructions [ideally in <a href="https://trac.osgeo.org/grass/wiki/HowToGit#Keepyourlocalsourcecodeuptodate" target="_blank">https://trac.osgeo.org/grass/wiki/HowToGit#Keepyourlocalsourcecodeuptodate</a>]?<br>><br>> Thanks much in advance<br>> Vero<br>><br>><br>><br>><br>> _______________________________________________<br>> grass-dev mailing list<br>> <a href="mailto:grass-dev@lists.osgeo.org" target="_blank">grass-dev@lists.osgeo.org</a><br>> <a href="https://lists.osgeo.org/mailman/listinfo/grass-dev" target="_blank">https://lists.osgeo.org/mailman/listinfo/grass-dev</a></div>
</blockquote></div>
_______________________________________________<br>
grass-dev mailing list<br>
<a href="mailto:grass-dev@lists.osgeo.org" target="_blank">grass-dev@lists.osgeo.org</a><br>
<a href="https://lists.osgeo.org/mailman/listinfo/grass-dev" rel="noreferrer" target="_blank">https://lists.osgeo.org/mailman/listinfo/grass-dev</a></blockquote></div></div>