Commit Merge Checklist

Jump to bottom

Lance Hunter edited this page Mar 13, 2018 · 4 revisions

Branch diagram:

Master
|
v
Dev---->Staging---->Deploy
^
|
|
|-->Feature
......^
......|
......v
.....You

NOTE:

Create a separate personal feature branch for every different feature you are working. Don't accidentally let partially-completed code for feature A end up in feature B's branch!

Creating a personal branch:

Is there already a feature branch for the feature you're working on? If so, go to step 9.
git checkout dev
git pull
git checkout -b (feature branch name)
Make one small change.
git add .
git commit -m "First commit for (feature branch name)
git push origin (feature branch name)
git checkout -b (personal branch off feature name)
Make one small change.
git push origin (personal branch off feature name)

Committing to your personal branch:

Do it all the time. Go nuts.
Be sure to push every commit.

Merging from feature branch to your personal branch

Do this at the beginning of the day, or any time someone working from the same feature branch reports a big breakthrough/change in your feature branch's code.

git checkout (feature branch)
git pull
git checkout (your branch)
git merge (feature branch)
git push origin (your branch)

NOTE: You are responsible for handling any merge conflicts. (If presented with a choice between code from the feature branch and code from your branch, try to select from feature branch unless you know that code is wrong/outdated.)

Merging from your personal branch to your feature branch

First, run any tests for your feature. Make sure they pass (if they aren't passing and you think it's the test's fault, consult the test-writer to double-check).
Talk to the Merge-Master. He'll make sure no one else is trying to merge to the same branch at the same time. He'll also let you know if any merges have happened since you last pulled that branch.
Get the go-ahead from the Merge-Master
git checkout (feature branch)
git merge (your branch) (If there are any merge conflicts, consult with Merge-Master when resolving them.)
git push origin (feature branch)
git checkout (your branch)
Tell the Merge-Master that you've finished the merge.

Merging from a feature branch to the Dev branch

Are you the Merge-Master? If not, get explicit permission from the Merge-Master first.

Merging from the Dev branch to Staging branch

Talk to the Deploy Team

Merging from the Staging branch to Deploy branch

Deploy Team only.