{"action":"opened","issue":{"url":"https://api.github.com/repos/Microsoft/visualfsharp/issues/1631","repository_url":"https://api.github.com/repos/Microsoft/visualfsharp","labels_url":"https://api.github.com/repos/Microsoft/visualfsharp/issues/1631/labels{/name}","comments_url":"https://api.github.com/repos/Microsoft/visualfsharp/issues/1631/comments","events_url":"https://api.github.com/repos/Microsoft/visualfsharp/issues/1631/events","html_url":"https://github.com/Microsoft/visualfsharp/issues/1631","id":183556239,"number":1631,"title":"Force push needed: Bad commits in \"master\" history","user":{"login":"dsyme","id":7204669,"avatar_url":"https://avatars.githubusercontent.com/u/7204669?v=3","gravatar_id":"","url":"https://api.github.com/users/dsyme","html_url":"https://github.com/dsyme","followers_url":"https://api.github.com/users/dsyme/followers","following_url":"https://api.github.com/users/dsyme/following{/other_user}","gists_url":"https://api.github.com/users/dsyme/gists{/gist_id}","starred_url":"https://api.github.com/users/dsyme/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dsyme/subscriptions","organizations_url":"https://api.github.com/users/dsyme/orgs","repos_url":"https://api.github.com/users/dsyme/repos","events_url":"https://api.github.com/users/dsyme/events{/privacy}","received_events_url":"https://api.github.com/users/dsyme/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2016-10-17T23:43:32Z","updated_at":"2016-10-17T23:43:32Z","closed_at":null,"body":"Some bad commits which confuse the Microsoft TFS Git implementation (used internally at Microsoft) entered the history of visualfsharp master branch recently, and a force push has been needed.  This may affect your working branches if you have cloned or pulled recently.\r\n\r\nThese commits are “bad” in that they represent repositories with multiple GIt directories distinguished only by capitalization. TFS’s Git support (used internally at Microsoft) can’t consume these commits.  We must expunge these commits from the history of the visualfsharp repo.  We have no choice since otherwise we can’t integrate back into the Microsoft build systems.\r\n\r\nThis is relevant if you have pulled visualfsharp master since Oct 13 and have a branch that contains any of the following commits, \r\n\r\n    commit 2a991b6c8e30c712640e2869972f02c6313cc7e3\r\n    commit 169d366713a31c0945328897db5fe58480bf1a43\r\n    commit d64ff35398a62c91103e9aa1373c2786bc0e83d6\r\n    commit 39480c4c402eb6e37b2ccfa9961189d29b352289\r\n    commit 2fe5a3be8227a379a33845c04762f51d3dd24fcf\r\n    commit e0318a8f65a596ddf234171c70bc3c535fd5f27f\r\n    commit 749ba2dfbbb457e1d746ce7659965d0ce0b34eac\r\n    commit 00bab9974f21e71db02e47a000cc6b101bf139a2\r\n    commit 2a9b5ef8189500e0af7bf2364d1f89e9b3dd5d1f\r\n    commit 8b434e0fedc4f5c51ace6d4c3191d04f01667546\r\n    commit 79430d298d916dbfb2628b5c60b9254f3316cc0c\r\n    commit b708921ebe0974a31b081f4bae58b4034f9beba9\r\n\r\nIf you have an open pull request or branch that includes the above commits, please rebase or cherry-pick your work to include none of the above commits, and instead be based on the last \"goog\" commit 2002675f8aba5b3576a924a2e1e47b18e4e9a83d .\r\n\r\nOne way to do this is to do the following in your branch:\r\n\r\n    git checkout your-branch\r\n\r\n    # Save your work before you do anything\r\n    git branch -f saved-copy-of-your-branch\r\n    git push origin saved-copy-of-your-branch\r\n\r\n    # Fetch the Microsoft repo and bring yourself up to date against the “bad” master branch\r\n    git remote add Microsoft http://github.com/Microsoft/visualfsharp \r\n    git pull Microsoft bad-master\r\n    <resolve conflicts>\r\n\r\n    # Save your work in a stash\r\n    git reset --soft 2a991b6c8e30c712640e2869972f02c6313cc7e3\r\n    git stash\r\n\r\n    # Reset back to the last good point in the history\r\n    git reset --hard 2002675f8aba5b3576a924a2e1e47b18e4e9a83d \r\n\r\n    # Apply the “good” version of the commits\r\n    git pull Microsoft master\r\n\r\n    # Replay your stash.  You can also cherry-pick your commits if you wish to keep your log messages\r\n    git stash apply\r\n\r\n    # Commit your changes once again. \r\n    git commit -a -m “your commit message”\r\n\t\r\n    # Do a forced update of your branch back to your Git account since your history has changed\r\n    git push -f origin your-branch\r\n\r\nIf you need advice, please comment below.\r\n\r\n"}}
{"actor":{"display_login":"dsyme"}}