On Tue, Mar 05, 2013 at 11:13:12PM +0100, David Krmpotic wrote:
> Hi guys! Thank you for responses.. I haven't suspected that repos
> created via GitHub windows app would have union set by default :( have
> to ask them about it.. it seems wrong to me… Here are the defaults for
> a windows repo cre
On 03/05/2013 07:47 PM, Junio C Hamano wrote:
> Jeff King writes:
>
>> I'm also not sure how useful those really are in practice. I have not
>> used "union" myself ever. And in the example that started this thread, I
>> find the use of "union" slightly dubious.
>
> Yeah, I do not think anybody s
Jeff King writes:
> I'm also not sure how useful those really are in practice. I have not
> used "union" myself ever. And in the example that started this thread, I
> find the use of "union" slightly dubious.
Yeah, I do not think anybody sane used "union" outside toy examples.
IIRC, it was origi
On Tue, Mar 05, 2013 at 07:44:13AM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > I think the merge will produce the results you are looking for. This
> > would have to be configurable, though, as it is a regression for
> > existing users of "union", which would want the duplicate-line
>
Jeff King writes:
> I think the merge will produce the results you are looking for. This
> would have to be configurable, though, as it is a regression for
> existing users of "union", which would want the duplicate-line
> suppression (or maybe not; it will only catch such duplicates at the
> beg
On Tue, Mar 05, 2013 at 04:03:26AM -0500, Jeff King wrote:
> You might be able to get by with a version of the "union" driver that
> asks the 3-way merge driver to be less aggressive about shrinking the
> conflict blocks. For example, with this patch to git:
>
> diff --git a/ll-merge.c b/ll-merge
On Mon, Mar 04, 2013 at 05:46:48PM +0100, David Krmpotic wrote:
> We started working on a .NET app and the XML project file (.csproj)
> got corrupted (a few closing tag missing).
>
> 79
> 80 SlovaricaForm.cs
> 81+
> 82+ Form
> 83+
> 84+
> 85
7 matches
Mail list logo