Mailing-List: contact dev-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@accumulo.apache.org
Received-SPF: pass (athena.apache.org: domain of josh.elser@gmail.com
 designates 209.85.213.172 as permitted sender)
Message-ID: <51AF65F1.6050909@gmail.com>
Date: Wed, 05 Jun 2013 12:23:13 -0400
From: Josh Elser <josh.elser@gmail.com>
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6;
 rv:17.0) Gecko/20130509 Thunderbird/17.0.6
MIME-Version: 1.0
To: dev@accumulo.apache.org
Subject: Re: GIT
References: 
 <CAL5zq9YpeH89fHj7DYZHdbD-9+gb9bev6fNJqBHbdJTJt67suw@mail.gmail.com>
 <CAL5zq9ZkTOz-grfqEjBiVwqUAX3pOwFTaE3hR8xXEoSr_Of_ng@mail.gmail.com>
 <51ADE68B.7090909@gmail.com>
 <CAGRe5hTN9TL_XgFMKn8oqseKoKRaX9t+26OgSK9qidPLGXdgsQ@mail.gmail.com>
 <51AE9F9B.5040201@gmail.com>
 <CALhtWkfS7rLVd50UiWtTDnJ3UqnfVJ4+wUftAubXiwwXoDsznA@mail.gmail.com>
 <51AEA737.6060100@gmail.com>
 <CAGUtCHp2GH0o-_X7hUbGdpkZ-+QQ4u-ZbtGwwwQw_h2HuM1rWg@mail.gmail.com>
 <51AF3A1B.8090201@gmail.com>
 <CAGUtCHrK-PJzEfSwe6yYk565o_zn6vFcbN5WMnLBHt1G9=qEYg@mail.gmail.com>
In-Reply-To: 
 <CAGUtCHrK-PJzEfSwe6yYk565o_zn6vFcbN5WMnLBHt1G9=qEYg@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit


On 6/5/13 10:51 AM, Keith Turner wrote:
>>> >>Can you give more detail about "history is easily mucked up"?  I am
>>> >>curious
>>> >>what constitutes a mucked up history and what sequence of steps lead to
>>> >>this?
>>> >>
>>> >>  http://dan.bravender.us/2011/**10/20/Why_cherry-picking_**
>> >should_not_be_part_of_a_**normal_git_workflow.html<http://dan.bravender.us/2011/10/20/Why_cherry-picking_should_not_be_part_of_a_normal_git_workflow.html>
>
>
> Thanks for the link, I do not think I could have easily found this via
> google because I would not have know what to search for.  I have little
> experience w/ git outside of small projects on github w/ one branch.  Info
> like this helps me make informed decisions.   Cherry picking vs merging
> seems to be at the heart of what you are talking about, are there any other
> key concepts?
>
Cherry-pick and merging is definitely important. There are likely 
others, but none immediately come to mind.

> Would probably be good to add this link, plus the other useful links posed
> in this thread, to the document you are working on.  I can make that change
> if you put it somewhere.
>
>
Yep, that's currently the plan. I'll throw it up in SVN tonight. (how meta)