Branch management - GhentAnalysis/heavyNeutrino GitHub Wiki

Make new branch

git checkout -b <newBranchName>
git push

General suggestions

When a branch is used to develop a new feature:

  • For small features developed on your own: consider using the master in you fork, from which you can also do a pull request to the master
  • For larger developments you can use a new branch, but delete it again once everything is merged in master (unless you plan to reuse it for further development)
  • If a branch is not used anymore, then you should consider to delete it

In case you keep a branch for a specific analysis:

  • Keep the changes with the master minimal, in this way it is easier to merge the latest updates from the master in your own branch
  • Try to follow the already existing structure/style of the code
  • Avoid bloatware, useless functions, duplicate variables etc...
  • If a feature is useful for everyone (especially bug fixes), you should develop it in the master instead such that everyone can benefit, then merge it again with your own branch