Skip to content
Sebastian Brzuzek edited this page Aug 23, 2013 · 1 revision

Rules:

  1. Keep master stable (no development on master)
  2. Use a feature branch for each new feature
  3. pull requests for each major new feature (cross verification)
  4. If long lived feature branches, rebase them continually from master, so we would get fast forward on master.
  5. Use git merge --no-ff when we merge feature branch into master so it's clear it's a new feature
Clone this wiki locally