我在dev分支中进行了更改并提交了更改。
然后转向掌握并尝试合并。
Switched to branch 'master'
root@li494-175:/home/ubuntu/workspace/rtbopsConfig# git merge --no-ff development
Auto-merging rtb_settings/rtb_settings.yaml
CONFLICT (content): Merge conflict in rtb_settings/rtb_settings.yaml
Automatic merge failed; fix conflicts and then commit the result.
我不知道这意味着什么。我厌倦了将bakc强加给掌握，我得到了这个错误。
root@li494-175:/home/ubuntu/workspace/rtbopsConfig# git checkout development
rtb_settings/rtb_settings.yaml: needs merge
error: you need to resolve your current index first
我根本就没有这个。我该如何解决？