Changes between Version 46 and Version 47 of StartModMaint
- Timestamp:
- Dec 23, 2013, 4:04:13 PM (9 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
StartModMaint
v46 v47 238 238 || Detached || Committed change || Behind || {{{git checkout --detach; git pull}}} || 239 239 || {{{master}}} || Unmodified || Up-to-date || {{{git checkout --detach}}} || 240 || {{{master}}} || Unmodified || Behind || {{{git pull}}} (but '''no t detached''') ||240 || {{{master}}} || Unmodified || Behind || {{{git pull}}} (but '''no detach''') || 241 241 || {{{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 '...' || 242 242 || {{{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 '...' || … … 250 250 || {{{develop}}} || Committed change || Behind || {{{git checkout --detach; git pull}}} || 251 251 252 Please be aware that {{{git checkout --detach;}}} and {{{git pull}}} are used as shorthand to describe the apparent effects. The actual git implementation may differ. 252 253 253 254 == Acknowledgements ==