Describe branching and merging process in documentation

tendermint / coding

14 stars 10 forks source link

Closed adrianbrink closed 6 years ago

adrianbrink commented 7 years ago

create branches on the repo itself not on a fork to allow other maintainers to rebase your code
always squash merge into develop from a feature branch
only use unstable if you need to integrate multiple feature branches before merging into develop
- unstable should only live for the duration of the merge
a merge into develop should comprise 1 commit with a properly formatted git title and message

zramsay commented 6 years ago

a lot of this sort of depends on the repo and/or the fix/feature itself. Duplicate of #17