Changes between Version 7 and Version 8 of CodeRepository

Timestamp:

Nov 26, 2020, 7:42:12 PM (3 years ago)

Author:

mdavis

Comment:

--

CodeRepository

@@ -13 +13 @@
  - [[GitLab|gitlab.com]] repository - need a gitlab.com or github.com account to contribute
  - [[GitHub|github.com]] repository - needs a github.com account to contribute
+
+== Workflows
+
+=== Merging a change
+
+This is one possible workflow for merging a change.  It assumes the developer has a fork of GEOS on their GitHub account.
+
+This workflow is a fast one to allow checking the CI using GitHub Actions (which runs in the dev's GitHub repo).
+This may result in merge commits; rebasing might be a better idea.
+
+{{{
+git push devguy mybranch
+... does it pass CI? ...
+... yes! ...
+git checkout master
+git pull origin master
+git merge --squash mybranch
+git commit -m 'my new commit message'
+git push origin master
+}}}