Unless there was a white space change I didn't detect in the upstream
version of the file, I was under the impression upstream and my local copy
were the same in this regard except for the extra new line I placed between
statements.
On Fri, Jan 10, 2014 at 11:37 AM, Daan Hoogland wrote:
> Mike,
Mike, the problem that git has is that both you and upstream changed
these lines. Now you have to decide which change to keep. Seems kind
of silly in this case of course.
On Fri, Jan 10, 2014 at 4:22 PM, Mike Tutkowski
wrote:
> Oh, and to clarify, my first e-mail about this where I showed some di
Oh, and to clarify, my first e-mail about this where I showed some diff
output was literally what Git gave me (I didn't modify it at all). It is an
example of where Git was asking me to manually intervene in a situation
where only a new line was added between two statements. Seems weird that it
wou
Yeah, that's definitely true, Wei. The weird part is how Git can solve some
of them automatically that are quite complex, but then it gives up and asks
for manual intervention on some other ones (like sometimes when a new line
is inserted between instructions).
I like Git a lot, I just happened to
It means some conflicts between the source branch and destination branch.
You need to fix them manually.
It is normal in version control systems (git,svn)
I had to cherry-pick 10 4.3 changes of mine into master today, so I was
noticing a lot of nice auto merges, but then a lot of silly
manual-intervention-required merges.
On Thu, Jan 9, 2014 at 11:28 PM, Mike Tutkowski <
mike.tutkow...@solidfire.com> wrote:
> Yeah, I guess what I'm wondering about
Yeah, I guess what I'm wondering about is just why some very complex
changes get auto merged perfectly, but then silly issues like I added a
line in between two statements don't.
On Thu, Jan 9, 2014 at 11:26 PM, Marcus Sorensen wrote:
> Master recently underwent all of the styling changes (delet
Master recently underwent all of the styling changes (deleting
whitespace, etc), and as such there's a lot that doesn't merge cleanly
via cherry-pick between 4.4 and 4.3. I'm not sure if that's what
you're referring to. The output shows you the conflict, one version
and the other, split by the
In other words, I'm wondering why this kind of change doesn't just get auto
merged.
On Thu, Jan 9, 2014 at 10:57 PM, Mike Tutkowski <
mike.tutkow...@solidfire.com> wrote:
> Hi,
>
> I often seem to get weird diff output like the following:
>
> <<< HEAD
>
> ===
>
>
> >>> ecd4a9c... CLO
