I have a current branch(registration_signin_apis),i tried to merge current branch in to a master by creating pull request but i got merge conflicts like this:
http://imgur.com/a/2HUQe
when i tried to edit this file to resolve my conflicts i didn't get any edit option
http://imgur.com/a/A9dNv
In my previous pull request i had seen edit option so i resolved my conflicts by editing there,but now in this pull requests it Showing 66 changed files with 2,644 additions and 601 deletions.
I think it has too many conflicts thats why its not showing edit option and also it suggested that please use command line to resolve your conflicts as we mentioned here : http://imgur.com/a/6Aeqp
or use git Hub desktop
I tried that commands too in my gitbush and also i tried to merge in android studio still no use
Can any one suggest me how to resolve merge conflicts and lead to pull request Success...?
答案 0 :(得分：0)
在项目根目录的控制台中尝试此操作：
git checkout master
git pull
git merge registration_signin_apis
会有冲突，您可以在Android Studio中解决它： VCS - ＆gt; Git - ＆gt;解决冲突
答案 1 :(得分：0)
您可以打开“版本控制”窗口以查看哪些文件存在合并冲突。然后在通常的编辑器窗格中打开它们以查看和编辑它们，以便解决冲突。