Hi Eike,

I'm afraid I don't understand, from that description, what exactly has happened.  I guess the main question is whether you had a merge conflict along the way; if not then it should be trivial to fix up.  Let's sort this out tomorrow morning if that's convenient?

Andrew

On 13 October 2015 at 19:36, Eike Mueller <E.Mueller@bath.ac.uk> wrote:
Dear firedrake,

I just realised that I made a stupid mistake and rebased the PyOP2 performance-logging branch (which is racking a remote branch) on master.

After syncing with the remote I end up with two sets of commits in my branch. Is there a safe way of fixing this or do I just have to live with the confusing history now?

Sorry!

Eike



_______________________________________________
firedrake mailing list
firedrake@imperial.ac.uk
https://mailman.ic.ac.uk/mailman/listinfo/firedrake