Re: Implementing git-am -3 with git-apply -3?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Paul Tan <pyokagan@xxxxxxxxx> writes:

> I wonder if it is possible to implement the 3-way merge in git-am
> using git-apply. Are there any issues/deficiencies that I need to be
> aware of?

Anything is possible ;-)

Even though I suspect it might be of significant complexity, it
certainly would be nice if "apply -3" could be taught to do
everything "am -3" would do.

> * git-apply does not handle renames in the index.

True.  The patch application does not really have a global picture,
and that is one of the reasons why I foresee significant complexity
as I said above.  The three-way merge with synthesized virtual base
tree done in "am -3" makes use of established and independent
component that is merge-recursive, and that makes things easier and
keeps things cleaner.

> * It could probably try harder at merging submodules (perhaps by using
> merge_submodule()?)

I am not sure what you mean.  I thought it punts what "am -3" would
punt on, and handles what "am -3" would handle.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]