Changes between Version 13 and Version 14 of HowToGit

Timestamp:

May 18, 2019, 7:31:54 AM (5 years ago)

Author:

wenzeslaus

Comment:

clean up and clarify the "clone osgeo" workflow

HowToGit

@@ -69 +69 @@
 # create fork via GitHub Web interface
 
-# checkout your fork
-git clone $my_for_url
-
-# all steps see above, core dev section
-...
+# checkout your the osgeo repo
+git clone https://github.com/OSGeo/grass.git
 
 # go to repo dir
 cd grass
 
-# add your fork as 
-git remote add github https://github.com/<username>/grass.git
-git remote set-url --push github ssh://git@github.com/<username>/grass.git
+# add your fork as another remote
+git remote add fork https://github.com/<username>/grass.git
 
-git push github <feature-branch>
+# change the push URL for your fork to SSH if you have it set up
+git remote set-url --push fork ssh://git@github.com/<username>/grass.git
 
-# push feature branch to own fork repo of GRASS GIS
-git push origin $feature_branch_name   # here: origin is fork repo
+# all steps see above, core dev section (branch, edit, commit)
+...
+
+# push feature branch to your own fork repo of GRASS GIS
+
+git push fork <feature-branch>
 
 # create pull request in GitHub Web interface (the link is shown conveniently in the terminal)
@@ -92 +93 @@
 This way origin is the authoritative source for the code, and additional remotes are forks.
 
+What is missing above is how you actually update the repo with changes in OSGeo repo master branch.
+
+Alternative is to clone your fork and add osgeo as another remote ("option 2" - "clone fork" as opposed to "clone osgeo"). This would be the same as what !GitHub documentation suggests. See: [https://help.github.com/en/articles/fork-a-repo Fork a repo] and [https://help.github.com/en/articles/syncing-a-fork Syncing a fork] in !GitHub help.
 == Keep your feature branch up to date ==