Changes between Version 7 and Version 8 of WorkingConventions/GitSPJ


Ignore:
Timestamp:
May 2, 2011 9:07:16 AM (3 years ago)
Author:
simonpj
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WorkingConventions/GitSPJ

    v7 v8  
    6767Now you can `git checkout experiment` to move onto your local `experiment` branch. 
    6868 
     69=== Connect up a local branch with its remote counterpart === 
     70 
     71You are on local branch `experiment` and do `git pull` to pull down changes from `origin/experiment`, but you get this: 
     72{{{ 
     73You asked me to pull without telling me which branch you 
     74want to merge with, and 'branch.experiment.merge' in 
     75your configuration file does not tell me, either. Please 
     76}}} 
     77Somehow you in a state where `experiment` isn't tracking `origin/experiment`.  To make it tracking, use `--set-upstream`: 
     78{{{ 
     79git branch --set-upstream experiment origin/experiment 
     80}}} 
     81 
     82 
    6983--------------- 
    7084