git-pre-release-conflict

Use when asked to publish or sync a feature branch to pre in this repo, or to resolve complex git conflicts that occur in that release flow.