Skip to content
Michael Schenk edited this page Jul 15, 2016 · 7 revisions
  1. What if I get ! [rejected] refs/notes/gtm-data -> refs/notes/gtm-data (non-fast-forward) when trying to git fetchgtm or git pushgtm?

You are getting this because at some point you git push but didn't also git pushgtm which pushes the gtm note data.

You can resolve this conflict by merging the notes.

git fetch origin refs/notes/gtm-data:refs/notes/origin/gtm-data
git notes --ref gtm-data merge -v origin/gtm-data

git pushgtm

If you always git fetchgtm and git pushgtm anytime you normally git fetch and git push you should be able to avoid merging.

Clone this wiki locally