Skip to content

Basic git contribution

Alexis Haumaitre edited this page Jun 9, 2018 · 2 revisions

Master is the sacred branch

You never directly commit to master, always create a branch and a Pull Request.

Branch naming

Your branch shoud start with either add/update/feat/fix/hotfix/clean followed by a couple of meaningfull words about your feature

Basic gitflow

  1. Moove to master branch (git checkout master)
  2. Fetch it and pull it (git pull --rebase)
  3. Create a branch from this freshly update master branch (git checkout -b my-feature)
  4. Commit and push you work often.
  5. When you finished your features or pack of fixes, create a Pull Request and request a review from A3-Antistasi/contributors.
  6. Add a more or less long description so we can know what this PR is more precisly doing (especially for bug fixes you can just #numberofissue to link it)
  7. Keep working on this branch until the branch (PullRequest) is merged to master.
  8. Delete the branch once it has been merged.

As soon as the branch/pull request has been merged you need to re-create a branch starting from a fresh updated master.

Clone this wiki locally