我对使用Git非常陌生,我正在努力更好地理解Git合并函数。希望有人能给我解释一下,我会很感激的!
所以,我在当地的一个测试部门工作,我发现了以下错误:
On branch Agata
Your branch and 'origin/Agata' have diverged,
and have 1 and 3 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
我的问题是
-
如何解决这个问题
-
这种合并会影响到主分支吗?
提前谢谢!