From: Santi Béjar <sbejar@gmail.com>
Date: Thu, 03 Apr 2008 22:03:01 GMT
Subject: Re: newbie with broken workflow
Message-ID: <8aa486160804031503j1ff3adbcu83f41eef14347370@mail.gmail.com>
In-Reply-To: <9d27c6320804031445p3fc80115n59218673dd587795@mail.gmail.com>

On Thu, Apr 3, 2008 at 11:45 PM, James Kingston
<james.kingston@gmail.com> wrote:
[...]

>
>  /c>     cd /c/cc
>  /c/cc>  git init
>  /c/cc>  git add *
>  /c/cc>  git commit
>  /c/cc>  mkdir /c/wd
>  /c/cc>  cd /c/wd
>  /c/wd>  git clone /c/cc
>  /c/wd>  cd cc/
>  /c/wd/cc>  ls
>  /c/wd/cc>  vi config.ini
>  /c/wd/cc>  git checkout -b config_changes
>  /c/wd/cc>  git diff
>  /c/wd/cc>  git add config.ini
>  /c/wd/cc>  git commit
>  /c/wd/cc>  git checkout master
>  /c/wd/cc>  git merge config_changes
>  /c/wd/cc>  vi config.ini
>  /c/wd/cc>  git push /c/cc

git push updates the branches, not the working copy, so:

cd /c/cc
git pull /c/wd/cc HEAD

>  /c/wd/cc>  cd /c/cc
>  /c/cc>  vi config.ini # doesn't show the change made in experimental
>  branch, though gitk shows the patch
>  /c/cc>  git status # says that config.ini has been modified
>  /c/cc>  git add config.ini # grasping as straws
>  /c/cc>  git commit # changes nothing, as far as I can tell
>  /c/cc>  git reset --hard #still changes nothing.  My diffs are there
>  in the log, just out of reach
>

Santi