>From Max Hodges, Mon 15 Oct 2012 at 11:04:01 (+0900) :
> Max Hodges@DUCHESS /D/Documents/GIT-repos/wre-website (fixed-livevalidation)
> $ git checkout --track -b master remote/origin/master
> fatal: git checkout: updating paths is incompatible with switching branches.
> Did you intend to checkout
I think I found a way to sort it out. I deleted my local repo, then used
the Clone function in SmartGit to start over
Max Hodges@DUCHESS /D/Documents/GIT-repos/wre-website2 (master)
$ git branch -a
* master
remotes/origin/#1-google-analytics-jquery-tracking
remotes/origin/#4
remotes/origin/H
"Note that Git does *not* touch remote branches unless it's performing
`git fetch
origin` which is specifically meant to download all the history from
origin, not present in the local repo, and update the remote branches
accordingly."
So "git fetch origin" is the only operation that touches remot
Hi Damien,
I tried the first step but I get an error which I don't fully comprehend
Max Hodges@DUCHESS /D/Documents/GIT-repos/wre-website (fixed-livevalidation)
$ git checkout --track -b master remote/origin/master
fatal: git checkout: updating paths is incompatible with switching branches.
Did y
On Friday, October 12, 2012 8:37:24 AM UTC+2, maxhodges wrote:
> I just deleted my local master so I guess I can merge the remote/master
> forward and that will become my new master?
>
No, it will just merge it to the branch you do the merge on (git does not
force you to track a remote branch
Hi Konstantin,
Thanks for offering to help.
When I look at my "git branch -a" output I see the remote branches, so
things make a bit more sense now. I deleted some local branches to "clean
things up" but then managed to pull them back down from the remote repo.
Also it seems I may have acciden
On Wed, 10 Oct 2012 08:10:51 -0700 (PDT)
maxhodges wrote:
> I have a git repo with multiple "origin" branches.
Do I understand right that you have a configured remote named "origin"
(either by creating that repo via cloning, which created such a remote
automatically or by running something like
