Do not commit the same change to multiple branches. Pick the "earliest" relevant branch and commit there. For example, if you commit to
Under limited circumstances, it may be necessary to cherry pick a commit or otherwise violate this rule. Please discuss before doing so.
In general, do not merge
|Branch||Description||Branches From||Merges To|
|master||Current release or release candidate||-||-|
|develop||New features scheduled for next minor release||-|
|hotfix-*||Bug fixes and minor changes scheduled for next bugfix release|
|feature-*||Experimental or prioritized features|