Re: correct git merge behavior or corner case?

From: Anders Melchiorsen <mail@cup.kalibalik.dk>
Date: Apr 20, 2009, 10:10 UTC
Message-ID: <41354.bFoQE3daRhY=.1240222235.squirrel@webmail.hotelhot.dk>
In-Reply-To: <alpine.DEB.1.00.0904201148150.6955@intel-tinevez-2-302>

Johannes Schindelin wrote:

> Second, he does not state what he expects to see instead.  And for the
> love of God, I cannot see what should be wrong in the output he gets.
> Another few notches down.

I think that I managed to recreate what he is describing.

#!/bin/bash

cd $(mktemp -d repo.XXXXX)

git init

touch date git add date git commit -memptydate

git branch parallel

touch LICENSE git add LICENSE git commit -mLICENSE

git checkout parallel date >date git add date git commit -mdate

git checkout master git rm date git commit -mnodate

git merge parallel

cat LICENSE

$ 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.