Re: [mantisbt-dev] [mantisbt-commits] [mantisbt/mantisbt] 132e1d: icon_api: added missing $t_status_icon_arr

[Damien R. <dr...@ma...>]

On 2013-10-31 09:25, Robert Munteanu wrote:
> On Thu, Oct 31, 2013 at 2:15 AM, Paul Richards <pa...@ma...> wrote:
>> Conflicts:
>>          library/adodb
>>          library/phpmailer
>>
>> Whats with the git conflicts?
>>
>> Should probably try to keep conflicts out of the final repository
>
> The conflicts are AFAICT due to the fact that I cherry-picked
> something from the 1.2.x branch on top of master, where we have
> submodules.

That's it

> There were no actual changes to the code, as can be verified from the diff.

In such case, in the future I would advise to remove the "Conflict" 
lines from the commit message, to avoid confusion.