You should never force push a shared branch, period. It's just luck that no one has pushed the changes you intended to remove *back* to develop. If someone has a copy of develop checked out and does a pull, git will merge your new copy of develop with their old copy of develop, and they'll push all that stuff right back. git revert is the only way to go.
>I did not see a pull for Karen's changes or I would have reached out to have them corrected. We are an open source project. Lots of people may have a copy of develop, and you won't know about it. It's not reasonable to break develop and expect to be able to personally contact everyone who has a copy of it and ask them to reset. -Dan On Wed, Mar 8, 2017 at 1:53 PM, Jacob Barrett <jbarr...@pivotal.io> wrote: > The force push was done to clean up a bunch of commits that broke develop > on the longer list of targeted platforms and moved them to another branch. > > It could have been done with a series of reverts. Sorry for the confusion. > Other pulls pending on Geode native were corrected. I did not see a pull > for Karen's changes or I would have reached out to have them corrected. > > I disagree on the blocking of force commits. Especially at his early stage > of source cleanup. > > -Jake > > On Wed, Mar 8, 2017 at 1:48 PM Dan Smith <dsm...@pivotal.io> wrote: > > > Karen and I just spent a long time tracking down weird git history in her > > checkout to discover that someone did a force push of the geode-native > > develop. That's not cool, because it screws over anyone with a copy of > the > > branch and we potentially lost history. > > > > I think we need to do two things. > > > > 1) Block force pushes on any shared branches (develop, master, > release-*). > > If we are in agreement, I'll file a JIRA with INFRA > > > > 2) Figure out what to with geode-native develop. It looks like there have > > been commits since the force push. Do we keep what is on the branch now, > or > > try to put it back to what it was? > > > > -Dan > > > > > > From: jbarr...@apache.org > > > > 4:57 PM (20 hours ago) > > > > to commits > > Repository: geode-native > > Updated Branches: > > refs/heads/develop aff706be2 -> 06e8f39a0 (forced update) > > >
