Changes between Version 7 and Version 8 of CodeRepository


Ignore:
Timestamp:
Nov 26, 2020, 7:42:12 PM (7 months ago)
Author:
mdavis
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • CodeRepository

    v7 v8  
    1313 - [[GitLab|gitlab.com]] repository - need a gitlab.com or github.com account to contribute
    1414 - [[GitHub|github.com]] repository - needs a github.com account to contribute
     15
     16== Workflows
     17
     18=== Merging a change
     19
     20This is one possible workflow for merging a change.  It assumes the developer has a fork of GEOS on their GitHub account.
     21
     22This workflow is a fast one to allow checking the CI using GitHub Actions (which runs in the dev's GitHub repo).
     23This may result in merge commits; rebasing might be a better idea.
     24
     25{{{
     26git push devguy mybranch
     27... does it pass CI? ...
     28... yes! ...
     29git checkout master
     30git pull origin master
     31git merge --squash mybranch
     32git commit -m 'my new commit message'
     33git push origin master
     34}}}