Showing posts with label conflict resolution. Show all posts
Showing posts with label conflict resolution. Show all posts

Tuesday, March 4, 2014

Git resolving conflict on remote machine

Git conflict resolution on remote server after two branches merging into master branch
Branches are master, armand and ralph.