Re: Conflict-free merging (i.e. concat) of conflicting branches?

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

Subject: Re: Conflict-free merging (i.e. concat) of conflicting branches?
From: "Richard Hartmann" <richih.mailinglist@xxxxxxxxx>
Date: Sun, 16 Nov 2008 22:44:03 +0100
Cc: git@xxxxxxxxxxxxxxx, markus.heidelberg@xxxxxx
In-reply-to: <7viqqn4ouo.fsf@xxxxxxxxxxxxxxxxxxxxxxxxxx>

On Sun, Nov 16, 2008 at 17:28, Junio C Hamano <gitster@xxxxxxxxx> wrote:

> gitattributes(5) and look for "union"?

Thanks.


Richard
--
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

References:
- Conflict-free merging (i.e. concat) of conflicting branches?
  - From: Richard Hartmann
- Re: Conflict-free merging (i.e. concat) of conflicting branches?
  - From: Junio C Hamano

Prev by Date: Re: Conflict-free merging (i.e. concat) of conflicting branches?
Next by Date: Re: GIT and SCC
Previous by thread: Re: Conflict-free merging (i.e. concat) of conflicting branches?
Next by thread: git svn problem with malformed svn revision
Index(es):
- Date
- Thread

[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]

Powered by Linux