# Possible git bug

2 messages from 2009-01-17 to 2009-01-17. Participants: Damon LaCrosse, Johannes Schindelin.
Thread: https://gitlist.dev/t/17225

## Damon LaCrosse, 2009-01-17 13:52

Subject: Possible git bug
Message-ID: <87zlhqca4m.fsf@inbox.ru>
URL: https://gitlist.dev/e/87zlhqca4m.fsf%40inbox.ru

```
HiQ,

any chances the attached patch reveals a git bug?

Cheers,



diff -Nru old/git-bug.sh new/git-bug.sh
--- old/git-bug.sh	1970-01-01 01:00:00.000000000 +0100
+++ new/git-bug.sh	2008-09-16 09:52:18.000000000 +0200
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+mkdir bug
+cd bug
+git init-db
+
+echo one > file1
+git add file1
+echo "Bug Test Example" | git commit --all -F -
+
+git checkout -b branch
+echo two >> file1
+echo "Branch modification" | git commit --all -F -
+
+git checkout master
+git mv file1 file2
+
+echo "Master rename" | git commit --all -F -
+
+echo three >> file2
+
+echo "Master modification" | git commit --all -F -
+
+git merge -s recursive branch

```

## Johannes Schindelin, 2009-01-17 15:16

Subject: Re: Possible git bug
Message-ID: <alpine.DEB.1.00.0901171613540.3586@pacific.mpi-cbg.de>
URL: https://gitlist.dev/e/alpine.DEB.1.00.0901171613540.3586%40pacific.mpi-cbg.de
In-Reply-To: <87zlhqca4m.fsf@inbox.ru>

```
Hi,

On Sat, 17 Jan 2009, Damon LaCrosse wrote:

> any chances the attached patch reveals a git bug?

You mean that it produces a merge conflict when a file was modified in one 
branch, and deleted in the other?

Because that's what you did, basically.  You did not rename file1 to 
file2.  You completely changed the contents.  I mean, completely.

Ciao,
Dscho

```