All geek questions in one place

Git: best way to resolve merge conflicts in git notes branch

What is the best approach to resolving merge conflicts in the git repository notes branch?

I came across a scenario where, when I try to retrieve the contents of a note branch from a remote repository, I get a Continuous Forward error message, the selection is rejected. Suggestions?

+4
source share
1 answer

I found out a way to merge in the git notes thread. Below is the approach I'm using. Please let me know if I am right.

git checkout refs/notes/commits git fetch origin refs/notes/commits:refs/notes/origin/commits git merge FETCH_HEAD git update-ref refs/notes/commits

Please let me know if this is the right approach.

0
source

Source: https://habr.com/ru/post/1499334/

More articles:


All Articles