Edit online

Centralized Workflow

Read time: 2 minute(s)

We all work with the same project(s) on the main repository branch. We have separate branches which mark past releases. Both for small bug fixes and for features which may take a longer time to implement, we work on the main branch. https://www.atlassian.com/git/tutorials/comparing-workflows



Common workflow:
  • Check in the project (one time operation).
  • Pull to get changes from the main repository.
  • Commit and push changes.
  • Deal with possible conflicts which may appear.
  • Request review either before commit or after the change was incorporated in the main branch.
Workflow for updating documentation for a past release:
  • Switch to branch specific for that release.
  • Pull to get changes from the main repository.
  • Commit and push changes.
  • Deal with possible conflicts which may appear.

Cherry Pick

Pick a commit from another branch and incorporate it. Useful to take small fixes for a version branch and add them to the main branch.