Open m-iancu opened 8 years ago
It should always take the remote's version in case of conflict. Some git stash or git reset --hard magic should to the trick I guess.
git stash
git reset --hard
It should always take the remote's version in case of conflict. Some
git stashorgit reset --hardmagic should to the trick I guess.