Changes between Version 3 and Version 4 of HowToGit

Timestamp:

May 18, 2019, 3:51:42 AM (5 years ago)

Author:

mmetz

Comment:

+keep feature branch up to date

HowToGit

@@ -90 +90 @@
 This way origin is the authoritative source for the code, and additional remotes are forks.
 
+== Keep your feature branch up to date ==
+
+[from https://github.com/OSGeo/gdal/blob/master/CONTRIBUTING.md#working-with-a-feature-branch]
+You may need to resynchronize against master if you need some bugfix or new capability that has been added since you created your branch
+
+{{{
+git fetch origin
+git rebase origin/master
+}}}
+
 == Review of pull requests ==