Best Practice for Keeping Merges and Promotes in Sync

We recommend that you merge into the child branch first and then fast forward merge the parent branch. If you merge into the child branch first, AccuRev will reflect this by performing a promote from the child stream to the parent stream. However, if you merge into the parent branch first, AccuRev will achieve the desired zero default group state by performing an AccuRev purge on the child stream.

The Git commands for merging into the child branch are:

• git checkout C
• git merge P
• git checkout P
• git merge C (This will be a fast-forward merge. Existing merge commit will be reused.)
• git push