Created
April 26, 2012 06:36
-
-
Save joncode/2496746 to your computer and use it in GitHub Desktop.
merging their branch to your branch?
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
How do I get robbie's 'store' branch and merge it into my 'cart' branch ? | |
from terminal in becker_sqlite ... | |
git clone https://github.com/robertSahm/becker_sqlite.git store | |
# puts his branch into my local repo - DID NOT WORK | |
from terminal in becker_sqlite ... | |
git pull https://github.com/robertSahm/becker_sqlite.git store | |
# WORKED ! | |
git pull - will fetch the repo becker_sqlite.git and grab the 'store' branch | |
- will merge that into whatever branch you are in in ur local repo | |
- check merge documentation | |
if merge is aborted | |
- go thru files and sort out all the conflicts in your text editor in local branch | |
- then git add . | |
- git commit -m "successful merge with https://github.com/robertSahm/becker_sqlite.git store" | |
DONE ! | |
use GitHub GUI if you don't like the result and want to REVERT COMMIT |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment