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