From: Brad Malone
To: git-users@googlegroups.com
Sent: Thursday, May 10, 2012 5:07 PM
Subject: Re: [git-users] Re: Basic question: confusing messages with git merge
Thomas and Antony,
Thank you both for taking time to write such detailed responses to my
question! Now let me get to
Thomas and Antony,
Thank you both for taking time to write such detailed responses to my
question! Now let me get to what you both have said individually.
Thomas,
Thanks for the notes on rebasing. From what I understood from reading git
tutorials before was that rebasing was something which was
Hi,
On Thursday, 10 May 2012 00:49:15 UTC+1, Brad wrote:
> What do these things mean? I'd imagine that 'Merge remote-tracking branch
> origin/master' should have been what happens when I type 'git merge
> origin/master', but what about the other? Could 'Merge branch master,
> remote-tracking b
Hi Brad,
The first merge commit there is a fairly typical occurrence: You have done
some local commits, while the remote master branch has diverged (i.e. other
commits have taken place there). Upon merging, Git cannot fast forward, so
it creates a merge commit, saying it is merging the branch o
