A fellow developer apparently made a serious mistake with git, putting most of the changes from master branch into the so-called stable "2.7" branch.
Because of the seriousness of this mistake, I have to "rewind" the history of the branch. This means that if you have ongoing work in the 2.7 branch, you will need to take extra care not to reintroduce these unwanted commits from master branch yourself. Please review these docs https://git-scm.com/docs/git-rebase#_recovering_from_upstream_rebase and (as I apparently failed to do) use tools like gitk and git log to visualize what you are about to push before you do so. Please ask on IRC if you have any questions or concerns, we can walk you through the necessary steps. Seb, Cradek and I should all be able to give appropriate advice for individual cases. This appears to have occurred back on 2015-11-22 with the commit: 2e604ba docs: dont have two copies of the project history there aren't any subsequent pushes to 2.7 (except a merge-up of 2.6) since that time. I will be rewinding the branch to this commit from 2015-11-23: 4ec9418 Merge remote-tracking branch 'origin/2.6' into 2.7 Jeff ------------------------------------------------------------------------------ _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
