git checkout -b start-anew 2.12_002
# - make edits here -
git checkout master
git merge -s recursive -X theirs \
  -m 'Merge branch "start-anew" (based on 2.12_002)' \
  start-anew
git branch -d start-anew
git log --oneline --decorate --graph