git

Git

Write a Feature

Create a local feature branch based off master.

• Without Git Flow

    git checkout master
    git pull
    git checkout -b <branch-name>
  

ps.: Start your branch name with feature/.

• With Git Flow

    git checkout master
    git pull
    git flow feature start <feature-name>
  

Rebase frequently to incorporate upstream changes.

  git fetch origin
  git rebase origin/master

Write a good commit message. Example format:

Capitalized, short (50 chars or less) summary

* More information about commit (under 72 characters).
* More information about commit (under 72 characters).

[Closes #4]

Share your branch.

  git push origin <branch-name>

Submit a GitHub pull request and mention people you want to review your code on the PR.

Review Code

A team member other than the author reviews the pull request. They make comments and ask questions directly on lines of code in the GitHub web interface.

When satisfied, they comment on the pull request LGTM (Looks good to me/merge), or 👍.

Merge

After the review, merge the branch to develop and if the code is going directly to production, merge to master too.

Delete your remote feature branch.

  git push origin --delete <branch-name>

Delete your local feature branch.

  git branch -D <branch-name>