Changes between Version 12 and Version 13 of HowToGit

Timestamp:

05/18/19 07:21:34 (6 years ago)

Author:

wenzeslaus

Comment:

merge option 1 and option 2 as one workflow (draft)

HowToGit

@@ -58 +58 @@
 NOTE: for different pull requests, simply create different feature branches.
 
-=== Workflow for external contributors - option 1 ===
+=== Workflow for external contributors ===
 
 - to be discussed -
 
 First fork the GRASS GIS repo in the !GitHub web interface.
+
+You clone the GRASS GIS repo and add the fork as an additional remote (or the other way around), this makes merging changes from the GRASS GIS repo easier.
 
 {{{
@@ -73 +75 @@
 ...
 
+# 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
+
+git push github <feature-branch>
+
 # push feature branch to own fork repo of GRASS GIS
 git push origin $feature_branch_name   # here: origin is fork repo
 
 # create pull request in GitHub Web interface (the link is shown conveniently in the terminal)
-}}}
-
-
-=== Workflow for external contributors - option 2 ===
-
-- to be discussed -
-
-You clone the GRASS GIS repo and add the fork as an additional remote, this makes merging changes from the GRASS GIS repo easier.
-
-{{{
-git clone https://github.com/OSGeo/grass.git
-cd grass
-git remote add github https://github.com/<username>/grass.git
-git remote set-url --push github
-ssh://git@github.com/<username>/grass.git
-...
-git push github <feature-branch>
 }}}