accumulo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Drew Farris <drew.far...@gmail.com>
Subject Re: [git] Documentation and Plan of Action
Date Thu, 13 Jun 2013 01:05:10 GMT
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

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message