How to resolve Git conflicts
It's a phenomenon that almost always happens when we are co-developing! Lol If you don't panic and calm down, there will be no problem, so it's okay. Let's go! !!
Contents
procedure
Update master (merge destination) Switch branches
$ git checkout master
Reflect the remote status
$ git pull
Return to the working branch
$git checkout working branch name
Do the following:
$ git fetch
$ git merge origin/master
Then it will let you know that there is a conflict.
Auto-merging db/schema.rb
CONFLICT (content): Merge conflict in db/schema.rb
Auto-merging config/routes.rb
Auto-merging app/views/layouts/application.html.erb
CONFLICT (content): Merge conflict in app/views/layouts/application.html.erb
Auto-merging app/assets/stylesheets/application.scss
CONFLICT (content): Merge conflict in app/assets/stylesheets/application.scss
Automatic merge failed; fix conflicts and then commit the result.
Let's take a look at where the conflict is occurring!
CONFLICT (content): Merge conflict in app/views/layouts/application.html.erb
When you open the editor, it will be displayed in purple, so it will be easy to understand. (Using vscode)
<<<<<<< HEAD
#Changes in the working branch
・ ・ ・
=======
# origin/master(Merged branch)Changes in
・ ・ ・
>>>>>>> origin/master
Leave master (latest) and delete the contents of your working branch
Don't forget to delete this too!
<<<<<<< HEAD
=======
>>>>>>> origin/master
When the correction of the part where the conflict occurs is completed Commit and push
git commit -m "Conflict resolution"
git push origin working branch name
This is ok. ww
Recommended Posts