Changes between Version 11 and Version 12 of WorkingConventions/GitSPJ

Show
Ignore:
Timestamp:
05/02/11 02:17:44 (2 years ago)
Author:
simonpj
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • WorkingConventions/GitSPJ

    v11 v12  
    7171It will fail if local branch `experiment` already exists -- in that case you may want to do the `--set-upstream` thing (see next item).  
    7272 
     73If git doesn't know that `origin/experiment` is a branch, it outputs the strange message 
     74{{{ 
     75fatal: git checkout: updating paths is incompatible with switching branches. 
     76Did you intend to checkout 'origin/experiment' which can not be resolved as commit? 
     77}}} 
     78You probably want to do a `git fetch`, then `git branch -r` to see what remote branches there are. 
     79 
    7380=== Connect up a local branch with its remote counterpart === 
    7481