github merge conflict and resolve conflicts button disabled

Question

I am new programmer and new to github this is the first time we are doing group project.we get merge conflict error and reveal merge disabled See The Screenshot

Answer 1

I think you have the conflicts are too big. You can do it manually in the terminal.

git checkout base-branch
git pull 
git checkout brach-that-you-want-to-merge
git merge base-branch

Now all the conflicts will be displayed in the code and you can choose which version you want to keep.