Also, I do have trunk's clone as of just before the concerned commits were pushed. I am willing to force push it, and we will push the only commit intended to be pushed.
On Wednesday, August 15, 2012 at 12:21 AM, Hari Shreedharan wrote:
> Hi Jukka,
> It seems like a commit to Flume's git-wip-us repo has created a bunch of merge commits(which were due to some local merges on the committer's local repo) on Flume's git repo. I know that we do have a policy against rewriting history, but I would like to request a reset of the trunk branch to a previous state(as of earlier today), so that we can remove the merge commits and keep the history linear. Only one extra "real" commit was pushed - which will be re-pushed.
> Please let me know if you need any more information.
> Hari Shreedharan