On Thu, 13 Jun 2013 11:37:42 -0400
Paul Smith <p...@mad-scientist.net> wrote:
> The question above is talking only about intermediate merge steps,
> where I want to bring in other peoples' changes into my work branch
> before I merge back to master.
> I'm just wondering if there's some issue with merging directly from
> origin/master, rather than first updating my local master and merging
> from that. I can't see one.
I can see one: commit ordering in case of your local "master" having
unpushed commits at the time of doing `git pull` so that the resulting
merge is a true merge, not a fast-forward. Otherwise there shouldn't
be any differences.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/groups/opt_out.