docs(workflow): require non-fast-forward merges
@@ -21,7 +21,7 @@
21
21
- When starting work on something, create a feature or fix branch
22
22
- When concrete, complete steps are made, create a commit in that branch
23
23
- Try to commit frequently, chunking work into individual steps
24
- When all work is done, merge the branch into master, and then delete it so only master remains
24
- When all work is done, merge the branch into master using a non-fast-forward merge commit (`git merge --no-ff`), and then delete it so only master remains
25
25
- Ensure you don't leave old branches you've made in git and that everything is merged neatly.
26
26
- Always run the full test suite and fix any issues (including unrelated to your work) before merging to master.
27
27
@@ -21,7 +21,7 @@21
- When starting work on something, create a feature or fix branch
21
- When starting work on something, create a feature or fix branch
22
- When concrete, complete steps are made, create a commit in that branch
22
- When concrete, complete steps are made, create a commit in that branch
23
- Try to commit frequently, chunking work into individual steps
23
- Try to commit frequently, chunking work into individual steps
24
- When all work is done, merge the branch into master, and then delete it so only master remains
24
- When all work is done, merge the branch into master using a non-fast-forward merge commit (`git merge --no-ff`), and then delete it so only master remains
25
- Ensure you don't leave old branches you've made in git and that everything is merged neatly.
25
- Ensure you don't leave old branches you've made in git and that everything is merged neatly.
26
- Always run the full test suite and fix any issues (including unrelated to your work) before merging to master.
26
- Always run the full test suite and fix any issues (including unrelated to your work) before merging to master.
27
27