Skip to content

Instantly share code, notes, and snippets.

@stbraley

stbraley/Merge Forked Repository

Created April 3, 2016 14:46
Show Gist options
  • Save stbraley/8e4926c04dacad20df5a21a03e50a7a3 to your computer and use it in GitHub Desktop.
Save stbraley/8e4926c04dacad20df5a21a03e50a7a3 to your computer and use it in GitHub Desktop.
Download ZIP
This is how I resolved the Merge Conflict from forked repsository
Raw
Merge Forked Repository
git clone https://github.com/JimBobSquarePants/ImageProcessor.git
cd ImageProcessor
git remote add upstream git://github.com/JimBobSquarePants/ImageProcessor.git
git fetch upstream
(from forked repository) git checkout core
(from original repository) git merge upstream/Core
Resolve conflicts in visual studio
Commit Merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment