On Thu, 13 Jun 2013 11:37:42 -0400
Paul Smith 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 direct
On Thu, 2013-06-13 at 19:30 +0400, Konstantin Khomoutov wrote:
> On Thu, 13 Jun 2013 11:00:42 -0400
> Paul Smith wrote:
> > Hi all. This is just a simple question. Most of the discussions of
> > "merge from master to my branch" I've seen recommend this:
> >
> > git checkout master
> > git p
On Thu, 13 Jun 2013 11:00:42 -0400
Paul Smith wrote:
> Hi all. This is just a simple question. Most of the discussions of
> "merge from master to my branch" I've seen recommend this:
>
> git checkout master
> git pull
> git checkout
> git merge master
>
> I did things this way at fir
