On Fri, 5 Aug 2011, Michael Wood wrote:

> I've not used TortoiseGit, so I'm not sure exactly what you're doing.
>
> Basically, you should be doing a "git fetch" (or "git fetch origin
> master") to update the origin/master remote branch to the latest version.
Then you
> should rebase your current branch onto origin/master.

Thank you Michael - that's got me going in the right direction now. I have
performed the a TortoiseGit -> Fetch, which invoked:

git.exe fetch -v --progress "origin"

..and whilst rebase is looking more promising than earlier I am struggling a
little with it at the moment as I had performed 3 commits and it seems to
want to review conflicts at each stage :(

Hopefully I will have something in a little while.

Regards

Steve

-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
Received on 2011-08-05