7;ve pulled.
>
> - Gordon
>
>
> -----Original Message-
> From: Justin Mclean [mailto:jus...@classsoftware.com]
> Sent: Friday, April 05, 2013 4:07 PM
> To: dev@flex.apache.org
> Subject: Re: Git needs a KISS
>
> Hi,
>
>> Okay, at its heart, th
mmit your changes before
pulling in other people's changes (I think).
- Gordon
-Original Message-
From: Justin Mclean [mailto:jus...@classsoftware.com]
Sent: Friday, April 05, 2013 4:07 PM
To: dev@flex.apache.org
Subject: Re: Git needs a KISS
Hi,
> Okay, at its heart, the danger
For those new to git ... this is a nice read:
http://tom.preston-werner.com/2009/05/19/the-git-parable.html
Am 06.04.2013 01:06, schrieb Justin Mclean:
> Hi,
>
>> Okay, at its heart, the danger Fred was worried about is that, using a merge
>> workflow, the person who pulls the changes needs to ma
Hi,
> Okay, at its heart, the danger Fred was worried about is that, using a merge
> workflow, the person who pulls the changes needs to make sure they commit all
> changes... even files they didn't touch, because they 'inherit' the merge.
Do you have any advice on how to get around this issue i
>I think we made a serious mistake by pushing the nvie branching model
>(http://nvie.com/posts/a-successful-git-branching-model/)
First, we aren't using that branching model. Not even close. That model defines
a viable workflow that we use successfully on many projects open and internal
(5 to
On Fri, Apr 5, 2013 at 10:27 AM, Gordon Smith wrote:
> KISS = Keep It Simple, Stupid
>
> We've gotten ourselves in a hole where contributors are overwhelmed by the
> complexity of our recommended Git workflows and command lines. We need to
> dig ourselves out, and quickly, before we lose momentum
KISS = Keep It Simple, Stupid
We've gotten ourselves in a hole where contributors are overwhelmed by the
complexity of our recommended Git workflows and command lines. We need to dig
ourselves out, and quickly, before we lose momentum.
I don't think we should move back to Subversion, but I thin
