On Thu, Jan 3, 2013 at 11:37 AM, Michael Haggerty wrote:
> Hi,
>
> I've been thinking lately about how to attack difficult git merge
> conflicts. The first step is to visualize them. I have written some
> articles [1,2,3] describing a way to atomize a complicated merge and
> efficiently compute
Hi,
I've been thinking lately about how to attack difficult git merge
conflicts. The first step is to visualize them. I have written some
articles [1,2,3] describing a way to atomize a complicated merge and
efficiently compute diagrams that show which pairwise commits cause the
merge to go awry.
2 matches
Mail list logo
