On Sun, 21 Aug 2011 13:39:35 -0700 (PDT)
Mark Liversedge liverse...@gmail.com wrote:
Dumb question. I'm working on a branch locally that is also over at
github. I fetch the latest from github with:
[...]
But when I pull other folks commits I get a merge commit and that
gets pushed up to
Thank you everyone. I will keep doing the same. I tried rebasing and had a
few issues (merge conflicts!).
Mark
--
You received this message because you are subscribed to the Google Groups Git
for human beings group.
To view this discussion on the web visit
Hi,
Dumb question. I'm working on a branch locally that is also over at github.
I fetch the latest from github with:
Make sure I'm clean
$ git checkout branch
$ git reset --hard origin/branch
$ git pull origin branch
Make changes and commit then
$ git push origin branch
But when I pull other
On Sunday, August 21, 2011, Mark Liversedge liverse...@gmail.com wrote:
Hi,
Dumb question. I'm working on a branch locally that is also over at
github. I fetch the latest from github with:
Make sure I'm clean
$ git checkout branch
$ git reset --hard origin/branch
$ git pull origin branch
