Eike, if I understand you correctly you rebased performance-logging and then pulled that branch from the remote so Git merged the remote and your local rebased branch? Looking at the current history of that branch you can sort it out as follows (assuming you're on performance-logging @ 2788a0f): git rebase -i 1a029b1 --onto b8a7bfd This will take your latest commit on top of the false merge and rebase it on the tip of the rebased branch (before the merge). Then force push. Hope this helps, Florian On 13/10/15 22:12, Andrew McRae wrote:
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 <mailto: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