You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Bill Sacks edited this page Jul 7, 2018
·
3 revisions
To apply bug fixes to both master and release-cism2.1:
Make the branch off of a commit that exists on both master and
release-cism2.1. Currently, we are trying to keep everything on
release-cism2.1 also on master, so you can do this by branching off
of the head of release-cism2.1.
Merge bug-fix branch into master
Merge bug-fix branch into release-cism2.1
Rebase bug-fix branch onto release-cism2.1-nohist, then merge it into that branch
Make sure that release-cism2.1-nohist is still identical to release-cism2.1 (a git diff between those branches should show no diffs)