Changes between Version 35 and Version 36 of HowToGit

Timestamp:

05/22/19 12:58:30 (6 years ago)

Author:

neteler

Comment:

--

HowToGit

@@ -109 +109 @@
 
 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 ==
+== Keep your local source code up to date ==
 
 [from https://github.com/OSGeo/gdal/blob/master/CONTRIBUTING.md#working-with-a-feature-branch]
@@ -119 +119 @@
 git fetch upstream
 git rebase upstream/master
+
+# if rebase fails with "error: cannot rebase: You have unstaged changes...", then move your uncommitted local changes to "stash"
+git stash
+# now you can rebase
+git rebase upstream/master
+# apply your local changes on top
+git stash pop
 }}}
 
-Now do your changes and commit and push them (ideally to a feature branch, see above).
+Continue do your changes and commit/push them (ideally to a feature branch, see above).
 == Review of pull requests ==