Re: correct git merge behavior or corner case?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]