git: best way to resolve merge conflicts in notes branch of git
what is the best approach to resolving merge conflicts in notes branch of
a git repository?
I ran into a scenario where in when I try to fetch the content of the
notes branch from the remote repository, I get an error saying
non-fast-forward, fetch rejected. Suggestions?
No comments:
Post a Comment