On Mon, Jun 3, 2013 at 7:20 PM, Junio C Hamano wrote:
> Sandro Santilli writes:
>
>> git merge anotherbranch
>> git add something
>> git commit --amend
>>
>> After the steps above the addition of "something" can't be found in
>> the history anymore, but the file is there.
>
> This is a very co
Sandro Santilli writes:
> git merge anotherbranch
> git add something
> git commit --amend
>
> After the steps above the addition of "something" can't be found in
> the history anymore, but the file is there.
This is a very common and sensible thing to do when dealing with
semantic conflict.
Hey all,
I've be burnt by what someone on IRC referred to as "evil merges",
that is loss of history after amending a merge commit:
git merge anotherbranch
git add something
git commit --amend
After the steps above the addition of "something" can't be found in
the history anymore, but the file
3 matches
Mail list logo
