Re: [elpa]: I possibly broke something

[David González Gándara]

Thanks for checking. I had never worked in git collaboratelly, I hope I get used to it soon.

On 3 December 2015 at 21:20, David Kastrup <address@hidden> wrote:

Artur Malabarba <address@hidden> writes:

> 2015-12-03 17:44 GMT+00:00 David Kastrup <address@hidden>:
>> How would you check using git-blame that he did not accidentally revert
>> changes in a bad merge?  Neither the old nor the new lines would be
>> traced to him.
>
> I had already checked (and stated) earlier that he didn't revert
> anything (with the diffs). Now I just checked whether he had "taken
> ownership" of any previous changes (with blame).

That's actually neigh impossible for a conflictless merge commit.  git
blame should not likely attribute anything to the committer of a merge
but manually resolved merge conflicts.

--
David Kastrup