Changes between Version 40 and Version 41 of Developer/Git


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

/* Merging Changes */

Legend:

Unmodified
Added
Removed
Modified
  • Developer/Git

    v40 v41  
    245245 git merge master
    246246}}}
    247 If 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.
     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. However, if branch1 has not been pushed remotely then rebasing might be a good alternative to merging because the merge generates a commit
    248248= Rebasing =
    249249