Re: [camf-dev] Change(42313) in camf/org.eclipse.camf[master]: Merge bra

[Markus Knauer <mknauer@xxxxxxxxxxxxxxxxx>]

Hi Nicholas,

I think Athanasios changed the commit message of your change set in Gerrit and this change has been merged (successfully) - which is why it change the "Committer" entry of the Git commit. At a later time you pulled this commit into your workspace and created this merge commit.

As I wrote in Gerrit, I'd suggest to abandon this merge-commit change in Gerrit.

Regards,

Markus

On 21 February 2015 at 09:39, Nicholas Loulloudes <loulloudes.n@xxxxxxxxxxxx> wrote:

Hey Markus,

What can you make out of this Gerrit message?  It seems to be a problem with different patch sets
but I am clueless on how to resolve it correctly.

Best,
Nicholas.

> On 20 Feb 2015, at 17:37, Athanasios Foudoulis (Code Review) <gerrit@xxxxxxxxxxx> wrote:
>
> Athanasios Foudoulis has submitted this change and it FAILED to merge.
>
> Change subject: Merge branch 'master' of ssh://nloulloud@xxxxxxxxxxxxxxx:29418/camf/org.eclipse.camf
> ......................................................................
>
>
> Change cannot be merged due to unsatisfiable dependencies.
>
> The following dependency errors were found:
>
> * Depends on patch set 1 of I42b4c322, however the current patch set is 3.
>
> Please rebase the change and upload a replacement commit.
>
> --
> To view, visit https://git.eclipse.org/r/42313
> To unsubscribe, visit https://git.eclipse.org/r/settings
>
> Gerrit-MessageType: merge-failed
> Gerrit-Change-Id: Ib2e72f8bc7ae6ec5bbe35cdccb22f365934c2329
> Gerrit-PatchSet: 1
> Gerrit-Project: camf/org.eclipse.camf
> Gerrit-Branch: master
> Gerrit-Owner: Nicholas Loulloudes <loulloudes.n@xxxxxxxxxxxx>
> Gerrit-Reviewer: Athanasios Foudoulis <foudoulisathanasios@xxxxxxxxx>