Changes between Version 14 and Version 15 of Developer/Git/Committers


Ignore:
Timestamp:
03/30/12 03:45:31 (12 years ago)
Author:
Gedare
Comment:

/* Update from upstream master (RTEMS head) */

Legend:

Unmodified
Added
Removed
Modified

  • Developer/Git/Committers

    v14 v15  
    8888}}}
    8989
    90 When you have committed changes on a branch that is public/shared with another developer you should not rebase that branch. TODO: what to do...
     90If you cannot do a fast-forward merge then you could use the --no-commit flag to prevent merge from issuing an automatic merge commit message.
     91
     92When you have committed changes on a branch that is public/shared with another developer you should not rebase that branch.
    9193=  GIT Push Configuration  =
    9294