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

[Markus Knauer <mknauer@xxxxxxxxxxxxxxxxx>]

It should be enough to right-click on the selected commit (ad22f2c) and use 'Reset' > 'Mixed'. This should leave your local files (uncommitted, changed) intact and reset the HEAD pointer to where it belongs. After doing this you should not see any 'outgoing' commits any more, and the old unrequired commits (4d96387 and b2e72f8) will be garbage collected some time in the future.

Regards,

Markus

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

Hi Markus, 

I abandoned the merge-commit change in Gerrit. 

However my workspace still indicates that I have 2 unpushed commits (see attached fig). 

How do I revoke these commits and sync my local master to the origin/master?

Best,

Nicholas.

On 21 Feb 2015, at 13:43, Markus Knauer <mknauer@xxxxxxxxxxxxxxxxx> wrote:

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