Changes between Version 39 and Version 40 of Developer/Git


Ignore:
Timestamp:
Feb 15, 2012, 9:15:27 PM (8 years ago)
Author:
Gedare
Comment:

/* Merging Changes */

Legend:

Unmodified
Added
Removed
Modified
  • Developer/Git

    v39 v40  
    237237 git branch -d branch2
    238238}}}
     239
     240If you have done work on a branch, say branch1, and have gone out-of-sync with the remote repository, you can pull the changes from the remote repo and then merge them into your branch:
     241{{{
     242 git checkout master
     243 git pull
     244 git checkout branch1
     245 git merge master
     246}}}
     247If all goes well the new commits you pulled into your master branch will be merged into your branch1, which will now be up-to-date.
    239248= Rebasing =
    240249