git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: martin <test2@mfriebe.de>
To: skottkuk@wp.pl, git@vger.kernel.org
Subject: Re: Logical bug during MERGE or REBASE
Date: Sat, 3 Jul 2021 11:07:25 +0200	[thread overview]
Message-ID: <4bae5d01-fa6d-7216-55cf-fa7003f5c75c@mfriebe.de> (raw)
In-Reply-To: <1932019063.20210702192555@wp.pl>

On 02/07/2021 18:25, skottkuk@wp.pl wrote:
> But as for me, it would be logical to consider the construction inside {} as something whole,
For git the {} are just text, like anything else in your file.

Also, seeing the function as a whole, i.e. always give a conflict for 
any 2 changes within one function, is not wanted.
There a plenty of cases where 2 or more changes within the same (bigger) 
function are merged together, and expected to be merged.

For all else see the reply from Atharva Raykar.

  parent reply	other threads:[~2021-07-03 11:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-02 16:25 Logical bug during MERGE or REBASE skottkuk
2021-07-03  7:57 ` Atharva Raykar
2021-07-04  6:12   ` Bagas Sanjaya
2021-07-04  6:30     ` Atharva Raykar
2021-07-03  9:07 ` martin [this message]
2021-07-03 11:03 ` Ævar Arnfjörð Bjarmason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4bae5d01-fa6d-7216-55cf-fa7003f5c75c@mfriebe.de \
    --to=test2@mfriebe.de \
    --cc=git@vger.kernel.org \
    --cc=skottkuk@wp.pl \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).