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 github.
> 
> I've come to the conclusion that my pull/push commands are flawed and
> I should do this differently.
> 
> How *should* I be doing this?
Note that while PJ Weisberg offered you a working and popular
solution, there's nothing inherently bad about merge commits, and this
is more a policy problem rather than technical one.
Many (most?) DVCSes do not support a concept of rebasing at all, so
bringing others' changes always results in a merge commit in those
systems.  A classical case for rebasing is when you do not have commit
access to the repository and are working on a feature which you then
plan to submit as a series of patches (via e-mail for instance),
otherwise merging may not be as bad as it may seem.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to