Re: [equinox-dev] [platform-releng-dev] Incorrect merge of osgiR8 branch into master for rt.equinox.framework

2020-03-11 Thread Thomas Watson
Thanks again Johah,   The blame history has been properly restored to the master branch and to the osgiR8 branch using this approach.  My mistake is now properly swept under the rug. Tom      - Original message -From: "Thomas Watson" Sent by: equinox-dev-boun...@eclipse.orgTo: equinox-dev@e

Re: [equinox-dev] [platform-releng-dev] Incorrect merge of osgiR8 branch into master for rt.equinox.framework

2020-03-11 Thread Thomas Watson
Thanks Jonah!   I had not considered doing that.  I will do this to preserve  the blame history. Tom      - Original message -From: Jonah Graham Sent by: equinox-dev-boun...@eclipse.orgTo: "Eclipse platform release engineering list." Cc: Equinox development mailing list Subject: [EXTERNAL]

Re: [equinox-dev] [platform-releng-dev] Incorrect merge of osgiR8 branch into master for rt.equinox.framework

2020-03-11 Thread Jonah Graham
Hi Thomas, If you want to maintain the blame history on your revert you can do the following. This will discard the bad merge from blame history without needing a force push. git checkout dabb1b38eaf020bb0f97ea331a3f6c5e5aefe565 -b new_master # the last good commit on master that you want to "rev