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

Re: correct git merge behavior or corner case?

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Apr 20, 2009, 09:49 UTC
Message-ID
<alpine.DEB.1.00.0904201148150.6955@intel-tinevez-2-302>
In-Reply-To
<4ac8254d0904191540j68246cd8qa36a034209d4c800@mail.gmail.com>
Hi,
On Mon, 20 Apr 2009, Tuncer Ayaz wrote:
Show 11 quoted lines
> I have stumbled upon the following blog post via one of the news 
> aggegrators and wondered whether the behavior is correct and expected or 
> he's expecting something wrong or doing something wrong.
> 
> I cannot see a wrong usage pattern from what he has written.
> 
> http://blog.teksol.info/2009/04/15/beware-of-gits-content-tracking.html
> 
> as the author hasn't posted here after a couple of days I decided to 
> take his question here for at least understanding what behavior he is 
> experiencing.

First, a blog posting is a lousy place to post complaints. That just decreased my confidence level in the competence of Francois.

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.

Ciao, Dscho

Previous: Shawn O. PearceNext: Anders Melchiorsen
Message 3 of 17 in “correct git merge behavior or corner case?”
  1. Tuncer AyazApr 19, 2009
  2. Shawn O. PearceApr 20, 2009
  3. Johannes SchindelinApr 20, 2009
  4. Anders MelchiorsenApr 20, 2009
  5. Jeff KingApr 21, 2009
  6. Jeff KingApr 21, 2009
  7. Junio C HamanoApr 21, 2009
  8. Sverre RabbelierApr 21, 2009
  9. Johannes SchindelinApr 21, 2009
  10. Sverre RabbelierApr 21, 2009
  11. Johannes SchindelinApr 21, 2009
  12. Johannes SchindelinApr 21, 2009
  13. Michał KiedrowiczApr 21, 2009
  14. Michał KiedrowiczApr 21, 2009
  15. Jeff KingApr 21, 2009
  16. Michał KiedrowiczApr 21, 2009
  17. Jeff KingApr 21, 2009

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.