git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Logical bug during MERGE or REBASE

From
Mmartin <test2@mfriebe.de>
Date
Jul 3, 2021, 09:07 UTC
Message-ID
<4bae5d01-fa6d-7216-55cf-fa7003f5c75c@mfriebe.de>
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.
Previous: Ævar Arnfjörð Bjarmason
Message 6 of 6 in “Logical bug during MERGE or REBASE”
  1. skottkuk@wp.plJul 2, 2021
  2. Atharva RaykarJul 3, 2021
  3. Bagas SanjayaJul 4, 2021
  4. Atharva RaykarJul 4, 2021
  5. Ævar Arnfjörð BjarmasonJul 3, 2021
  6. martinJul 3, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.