{"thread":{"id":"17225","subject":"Possible git bug","startedAt":"2009-01-17T13:52:57Z","lastAt":"2009-01-17T15:16:01Z","messageCount":2,"participants":["Damon LaCrosse","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"100830","messageId":"87zlhqca4m.fsf@inbox.ru","threadId":"17225","inReplyTo":null,"subject":"Possible git bug","fromName":"Damon LaCrosse","fromEmail":"arid@inbox.ru","sentAt":"2009-01-17T13:52:57Z","receivedAt":"2009-01-17T13:52:57Z","isPatch":false,"sender":{"key":"arid@inbox.ru","avatar":null},"body":"HiQ,\n\nany chances the attached patch reveals a git bug?\n\nCheers,\n\n\n\ndiff -Nru old/git-bug.sh new/git-bug.sh\n--- old/git-bug.sh\t1970-01-01 01:00:00.000000000 +0100\n+++ new/git-bug.sh\t2008-09-16 09:52:18.000000000 +0200\n@@ -0,0 +1,24 @@\n+#!/bin/bash\n+\n+mkdir bug\n+cd bug\n+git init-db\n+\n+echo one > file1\n+git add file1\n+echo \"Bug Test Example\" | git commit --all -F -\n+\n+git checkout -b branch\n+echo two >> file1\n+echo \"Branch modification\" | git commit --all -F -\n+\n+git checkout master\n+git mv file1 file2\n+\n+echo \"Master rename\" | git commit --all -F -\n+\n+echo three >> file2\n+\n+echo \"Master modification\" | git commit --all -F -\n+\n+git merge -s recursive branch\n"},{"id":"100833","messageId":"alpine.DEB.1.00.0901171613540.3586@pacific.mpi-cbg.de","threadId":"17225","inReplyTo":"87zlhqca4m.fsf@inbox.ru","subject":"Re: Possible git bug","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-01-17T15:16:01Z","receivedAt":"2009-01-17T15:16:01Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sat, 17 Jan 2009, Damon LaCrosse wrote:\n\n> any chances the attached patch reveals a git bug?\n\nYou mean that it produces a merge conflict when a file was modified in one \nbranch, and deleted in the other?\n\nBecause that's what you did, basically.  You did not rename file1 to \nfile2.  You completely changed the contents.  I mean, completely.\n\nCiao,\nDscho\n"}]}