From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jon Seymour Subject: Re: [PATCH v3 0/2] git-gui: change to display the combined diff in the case of conflicts. Date: Wed, 31 Mar 2010 23:12:30 +1200 Message-ID: References: <2cfc40321003300834w59532e58m13d42acce4f2c5ce@mail.gmail.com> <4BB2F7A0.6020702@viscovery.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: Git Mailing List , spearce@spearce.org To: Johannes Sixt X-From: git-owner@vger.kernel.org Wed Mar 31 13:12:41 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Nwvqh-0003ak-IM for gcvg-git-2@lo.gmane.org; Wed, 31 Mar 2010 13:12:39 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756930Ab0CaLMe (ORCPT ); Wed, 31 Mar 2010 07:12:34 -0400 Received: from mail-pz0-f186.google.com ([209.85.222.186]:45691 "EHLO mail-pz0-f186.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756787Ab0CaLMd (ORCPT ); Wed, 31 Mar 2010 07:12:33 -0400 Received: by pzk16 with SMTP id 16so572105pzk.22 for ; Wed, 31 Mar 2010 04:12:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:received:message-id:subject:from:to:cc:content-type; bh=xM+HUv7rEL/wk+AmGplefancKaxD30wOk2RfMUkghnw=; b=jzEOsWZV90Fi2Lv1bA9wKsb2pJ+ZPmptq/hLZKUc3RufdXnWYiVUnTXcpezW2hqXKO /2ZfDohR0W9IVAHvgnEyMTPboH6kNB3rTmrjpmpqp69780ZAZi4uYRh8bu0G/SPbyZ5X Mey/I1/My/mmkSH/bTAJa39xk8p8Qnba858MQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=ejHYvO1OmpKxbCNjezJSy4TKP1/skAEeruVz3JgfhulWtlrT/I5cAFO071TdJG8KL8 635sIAyQihuMjdIzO+ZHN5lQ8AJS+93UhtkjUVAiTW1J5qsVL/gDJ0xcN1d62dwmnW1H e2m244CO2J46nUOjI33Zy1RynoBdCitY/rpho= Received: by 10.114.13.5 with HTTP; Wed, 31 Mar 2010 04:12:30 -0700 (PDT) In-Reply-To: <4BB2F7A0.6020702@viscovery.net> Received: by 10.114.164.7 with SMTP id m7mr5945411wae.125.1270033950776; Wed, 31 Mar 2010 04:12:30 -0700 (PDT) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: > I looked at the result, but it does not convince me. In my case, I have a > large file that has many changes between the "maint" and "master" > branches. Whenever there are conflicts after merging "maint" to "master", > I see all these changes, and really they *are* uninteresting. > I think you may have missed the point of my patch. The successfully merged lines may be uninteresting from the point of deciding what I should *do* but they are highly relevant to the question of what I really, really should *not* do. If there are 100 successfully merged lines from each side of the merge but only 2 conflicting lines, should I a) pick the remote branch b) pick the local branch c) manually edit the conflicting line (or use a merge tool) The point of my patch it to make it much more likely that you will pick c). In the current state, the GUI doesn't make it clear that either a) or b) is almost certainly a huge mistake. Now, you could disable Use Remote and Use Local for all but the very simplest cases - but you don't need it for these cases. Hell, ed would do for these. jon.