Link

How to solve a merge conflict in Git

How to solve a merge conflict in Git

This is one of the best explanations I have found on how to solve a merge conflict.

– Open the file and solve the conflict, deleting the code you discard as well as the “<<<<“

– git add the file

– git commit 

and then follow as normal git push, git pull etc

happy coding

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s