Fix merge problems with git

From PROGRAMAGE
Jump to navigation Jump to search

When Git is not working because of merge issues one way to fix the problem is to do a hard reset like this:

<syntaxhighlight lang="PHP"> git reset --hard origin/master <syntaxhighlight>