Changes between Version 46 and Version 47 of StartModMaint


Ignore:
Timestamp:
Dec 23, 2013, 4:04:13 PM (9 years ago)
Author:
Beman Dawes
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • StartModMaint

    v46 v47  
    238238|| Detached || Committed change || Behind || {{{git checkout --detach; git pull}}} ||
    239239|| {{{master}}} || Unmodified || Up-to-date || {{{git checkout --detach}}} ||
    240 || {{{master}}} || Unmodified || Behind || {{{git pull}}} (but '''not detached''') ||
     240|| {{{master}}} || Unmodified || Behind || {{{git pull}}} (but '''no detach''') ||
    241241|| {{{master}}} || Uncommitted change || Up-to-date || error: Your local changes to the following files would be overwritten by checkout: ... Please, commit your changes or stash them before you can switch branches. Aborting Unable to checkout (SHA...) in submodule path '...' ||
    242242|| {{{master}}} || Uncommitted change || Behind || error: Your local changes to the following files would be overwritten by checkout: ... Please, commit your changes or stash them before you can switch branches. Aborting Unable to checkout (SHA...) in submodule path '...' ||
     
    250250|| {{{develop}}} || Committed change || Behind || {{{git checkout --detach; git pull}}} ||
    251251
     252Please be aware that {{{git checkout --detach;}}} and {{{git pull}}} are used as shorthand to describe the apparent effects. The actual git implementation may differ. 
    252253
    253254== Acknowledgements ==