Mailing-List: contact dev-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@accumulo.apache.org
Received-SPF: pass (nike.apache.org: domain of drew.farris@gmail.com
 designates 209.85.128.182 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CAL5zq9Yhu7nzHnPALRg-2E+-9rgYb4z3C5ZF35SzJEXFH+7QRw@mail.gmail.com>
References: <51AEAAD0.9020902@gmail.com>
	<51AFECB5.9010901@gmail.com>
	<51B68F00.6020904@gmail.com>
	<CAL5zq9ZO4W_sWmc=W6s33-CX7tQ_yS=Jf70oO0aagqBOJYxP9Q@mail.gmail.com>
	<CAOyNEs4TR93e8REwhauTLM52jpJOUX3DPQiUHEtGtJrrc1es1Q@mail.gmail.com>
	<CAL5zq9Yhu7nzHnPALRg-2E+-9rgYb4z3C5ZF35SzJEXFH+7QRw@mail.gmail.com>
Date: Wed, 12 Jun 2013 21:05:10 -0400
Message-ID: 
 <CAGRe5hRWH9M6Tq8cLbreRPwpnj1maqouxuJXVWvhVPbiZ9W9yw@mail.gmail.com>
Subject: Re: [git] Documentation and Plan of Action
From: Drew Farris <drew.farris@gmail.com>
To: "dev@accumulo.apache.org" <dev@accumulo.apache.org>
Content-Type: multipart/alternative; boundary=001a11c32386d0af5904defeb8e6

--001a11c32386d0af5904defeb8e6
Content-Type: text/plain; charset=ISO-8859-1

Josh, Chris, Mike, thanks for hashing this out. The document is long, but I
believe it contains the appreciate level of detail so as to eliminate
many ambiguities/questions as to how things are done.

I have a couple questions. From the docs:

" Whatever the actual case is, the developer who made the first set of
changes (you) is the one responsible for performing the merge through the
rest of the active versions. Even when the merge may results in a
zero-length change in content, this is incredibly important to record as
you are the one who knows that this zero-length change in content is
correct!"

Sorry for the newb question, but how does one actually create zero length
commit?

Also, I have encountered cases where a merge has pulled in changes from
previous branches that were unrelated to the particular changes I am trying
to merge upwards. I suspect this has something to do with the fact that
someone else has done something wrong (eg: neglected to merge their
change). What is the appropriate approach to resolving this issue?

Drew

--001a11c32386d0af5904defeb8e6--