Re: Merge with local conflicts in new files

[Junio C Hamano <junkio@cox.net>]

Santi <sbejar@gmail.com> writes:

> 2006/5/17, Junio C Hamano <junkio@cox.net>:
>> Santi <sbejar@gmail.com> writes:
>>
>> >       In the case of:
>> >
>> > - You merge from a branch with new files
>> > - You have these files in the working directory
>> > - You do not have these files in the HEAD.
>>
>> and
>>
>>  - You have not told git that these files matter.
>
> For me it is the other way, all my files matter but git can do
> whatever it wants with the ones it controls.

You really do not mean that.

If you told git a file matters, and have local modifications to
the file in the working tree that you have not run update-index
yet, merge and apply should be careful not to overwrite your
changes that is not ready while doing whatever thing they have
to do.  And they are careful, because you have told git that
they matter, and the way you tell git that they matter is to
have entries for them in the index.