在推送后恢复空的合并提交
Reverting an empty merge commit after it has been pushed
我采取的步骤：
- 合并主分支到我的功能分支。
- 开始解决提交，不小心在其中一个冲突中使用他们的提交解决，想重做。
- 重置所有更改。
- 此时我似乎无法做任何事情，因为我处于合并状态，我不小心提交了这些更改并推送到 GitHub（我使用了 SourceTree 并勾选了该选项！）
现在，每当我尝试从 master 合并时，它都会假设我已经有了最新的更改，并且没有任何内容添加到我的功能分支中。
我尝试了 运行 git revert -m 1 <commit hash of the empty commit> 但我得到了：
On branch feature/profile_page
Your branch is up-to-date with 'origin/feature/profile_page'.
nothing to commit, working tree clean
然后我尝试恢复之前的更改，但现在本地是 GitHub 上功能分支后面的一次提交。
有什么想法吗？
这是我的日志：
* ff46aa6 (HEAD -> feature/profile_page, origin/feature/profile_page) Revert "Added link to user profile page in MainMenu"
* 64e96b3 .
|\
| * 9c023f5 (origin/master, origin/HEAD, master) Made the delete button invoke a pop-up which can delete the responders.
| * 87a028c Added a placeholder page that can be used to link to, or navigate from when you need a placeholder page.
| * 6ae954d Added the ResponderGroupPage and new delete icon.
| * 752fb83 Updated the layout to closer match the mock-up
| * 55e8c29 Added missing schedule icon
| * 6255338 Tweaks to make the page work/look correct on iOS
| * 178beb1 Update to the IncidentHistoryPage so that it displays a history of an event as a list under your selected item when you select one.
| * 5bfbbf1 Added titles to pages and button to link to IncidentHistoryPage.
| * 4570346 Added basic IncidentHistoryPage using mock data
* | 663a378 Added link to user profile page in MainMenu
* | 123da81 Added EditProfilePasswordPage and CloseAccountPage
* | 40a00ea Added change phone number page
* | b80f9af Added Change email page
* | 8a3710a Added MySubscriptions Page
* | 3c8ddee Added MyAccountPage
* | dd4fa9e ImageWithPopupMenu handles events
* | cbfae5f Added ImageWithPopupMenu
* | 304dd5c .
* | b730e7f EditProfilePage first pass
* | 0ac9603 Added UserProfile view model
* | af7f6ed .
* | 5f4e0c0 Profile Page first pass
| | * bbbbc4d (origin/feature/api_hooks) Setting up a wearer after activating a device will now associate the wearer with the device. Added WearerDataStore which will retrieve and manage the wearer list shown on the home screen.
| | * 45b3639 App will now check if a user is currently logged in when it launches. - If there is currently an active session, which is not authenticated with the API key, then the app will navigate to the home screen instead of landing.
| | * 88250f5 Sign in page now using Bindings with view model for the entry text. Sign in page now using localisation. Added api calls to sign up process. Added validation to the sign up process for checking email address and phone numbers.
| |/
| * 2590342 Merge branch 'master' of https://github.com/FirstAppLtd /Watchie_Xamarin
| |\
| | * 4e13537 Added the EditSafezonePage and placeholder pop-ups for CALL/RAISE SOS on the Homescreen and Wearer Profile screens.
| | * ee1a2dc Merge branch 'master' into hockeyapp_integration
| | |\
| | | * 7f1d961 New icon paths
| | * | 3d05a1f Merge branch 'master' into hockeyapp_integration
| | |\ \
| | | |/
| | | * 66d6303 Reworked the Homescreen so that it works on iOS as the list view didn’t work correctly. I moved the Icons on iOS into the root resources so that they can be indexed in the same way as on Android to avoid any needing to do #ifIOS look here.
| | | |\
| | | | * d7e2d63 (origin/UpdatingIcons) Fix for the Homescreen so that it displays correctly on iOS. Moved where the iOS icons are stored so that they can be referenced exactly like the Android assets.
| | | | * 5d6846a New branch updating the icons
| | * | | a8d3ddc Set Android HockeyAppId
| | * | | df479a2 Set iOS HockeyAppId
| | * | | d0c820d Integrated HockeyAppId from info.plist. Disabled AuthenticateInstallation call for current config.
| | * | | d0702fe Added iOS HockeyApp to the Info.plist file
| | * | | 05f627a Refactored the HockeySDK App ID to the AssemblyInfo file for Android
| | * | | f99cf8e Added HockeySDK update to Android
| | * | | d0c94d0 Added ability to enable HockeySDK User metrics in Android
| | * | | 2b14729 Disabled HockeySDK for iOS
| | * | | 32fa935 Integrated HockeySDK for Android to detect crashes
| | * | | 58017a5 Added HockeySDK NuGet package to Android solution
您在合并之前还原了提交，这将创建一个新的提交来撤消该提交。我想你想做的是 git reset 将分支引用重置为提交。
如果您想重置为合并任何内容之前的状态，您可以执行以下操作：
git checkout feature/profile_page
git reset --hard 663a378 这会将功能分支本地设置为合并提交之前的提交。在远程中，您必须执行 git push -f，这将重写您远程中的历史记录。如果你是唯一一个在分支机构工作的人，并且你有正确的权限，那就没问题了。
或者您可以在 663a378 git checkout -b 663a378 上创建一个新的功能分支，您可以使用它来执行您想要的合并。
根据您的日志，我认为最干净的解决方案是：
git checkout 663a3784ab82f019996a5091f3dfb2401c0403b5 -b feature_clean
这会将您标记为 "valid"（编辑之前）的合并之前的提交检出为新分支 "feature_clean"。然后你可以执行合并（git merge master）并确保它是干净的。最终，您可以用 feature_clean 替换特征，例如删除前者并重命名后者：
git branch -d feature # delete old branch
git branch -m feature_clean feature # rename clean branch
git push -f # force push feature to rewrite history on remote
我不建议 git reset 663a37... --hard 后跟强制推送的原因是这样可以保留 "broken" 分支并且可以根据需要经常执行 git checkout 663...它来解决冲突。
希望对您有所帮助。
这是重播您的提交的一种方法：
使用 "work in progress" 分支从提交 663a378 重新启动：
git branch wip 663a378
git checkout wip
重新运行 "merge master into this branch" :
git merge master
解决冲突，
并提交，可能编辑提交以将您期望的分支名称放入消息中（例如："merge master into feature/profile_page" 而不是 "merge master into wip"）
如果您对这个新合并感到满意：将以前的分支移动到这些新提交中：
# push current commit to the remote "feature/profile_page" branch :
git push -f origin wip:profile_page
# set your local "profile_page" branch to this new commit :
git branch -f profile_page wip
# switch to other branch and delete wip :
git checkout profile_page
git branch -d wip
我采取的步骤：
- 合并主分支到我的功能分支。
- 开始解决提交，不小心在其中一个冲突中使用他们的提交解决，想重做。
- 重置所有更改。
- 此时我似乎无法做任何事情，因为我处于合并状态，我不小心提交了这些更改并推送到 GitHub（我使用了 SourceTree 并勾选了该选项！）
现在，每当我尝试从 master 合并时，它都会假设我已经有了最新的更改，并且没有任何内容添加到我的功能分支中。
我尝试了 运行 git revert -m 1 <commit hash of the empty commit> 但我得到了：
On branch feature/profile_page
Your branch is up-to-date with 'origin/feature/profile_page'.
nothing to commit, working tree clean
然后我尝试恢复之前的更改，但现在本地是 GitHub 上功能分支后面的一次提交。
有什么想法吗？
这是我的日志：
* ff46aa6 (HEAD -> feature/profile_page, origin/feature/profile_page) Revert "Added link to user profile page in MainMenu"
* 64e96b3 .
|\
| * 9c023f5 (origin/master, origin/HEAD, master) Made the delete button invoke a pop-up which can delete the responders.
| * 87a028c Added a placeholder page that can be used to link to, or navigate from when you need a placeholder page.
| * 6ae954d Added the ResponderGroupPage and new delete icon.
| * 752fb83 Updated the layout to closer match the mock-up
| * 55e8c29 Added missing schedule icon
| * 6255338 Tweaks to make the page work/look correct on iOS
| * 178beb1 Update to the IncidentHistoryPage so that it displays a history of an event as a list under your selected item when you select one.
| * 5bfbbf1 Added titles to pages and button to link to IncidentHistoryPage.
| * 4570346 Added basic IncidentHistoryPage using mock data
* | 663a378 Added link to user profile page in MainMenu
* | 123da81 Added EditProfilePasswordPage and CloseAccountPage
* | 40a00ea Added change phone number page
* | b80f9af Added Change email page
* | 8a3710a Added MySubscriptions Page
* | 3c8ddee Added MyAccountPage
* | dd4fa9e ImageWithPopupMenu handles events
* | cbfae5f Added ImageWithPopupMenu
* | 304dd5c .
* | b730e7f EditProfilePage first pass
* | 0ac9603 Added UserProfile view model
* | af7f6ed .
* | 5f4e0c0 Profile Page first pass
| | * bbbbc4d (origin/feature/api_hooks) Setting up a wearer after activating a device will now associate the wearer with the device. Added WearerDataStore which will retrieve and manage the wearer list shown on the home screen.
| | * 45b3639 App will now check if a user is currently logged in when it launches. - If there is currently an active session, which is not authenticated with the API key, then the app will navigate to the home screen instead of landing.
| | * 88250f5 Sign in page now using Bindings with view model for the entry text. Sign in page now using localisation. Added api calls to sign up process. Added validation to the sign up process for checking email address and phone numbers.
| |/
| * 2590342 Merge branch 'master' of https://github.com/FirstAppLtd /Watchie_Xamarin
| |\
| | * 4e13537 Added the EditSafezonePage and placeholder pop-ups for CALL/RAISE SOS on the Homescreen and Wearer Profile screens.
| | * ee1a2dc Merge branch 'master' into hockeyapp_integration
| | |\
| | | * 7f1d961 New icon paths
| | * | 3d05a1f Merge branch 'master' into hockeyapp_integration
| | |\ \
| | | |/
| | | * 66d6303 Reworked the Homescreen so that it works on iOS as the list view didn’t work correctly. I moved the Icons on iOS into the root resources so that they can be indexed in the same way as on Android to avoid any needing to do #ifIOS look here.
| | | |\
| | | | * d7e2d63 (origin/UpdatingIcons) Fix for the Homescreen so that it displays correctly on iOS. Moved where the iOS icons are stored so that they can be referenced exactly like the Android assets.
| | | | * 5d6846a New branch updating the icons
| | * | | a8d3ddc Set Android HockeyAppId
| | * | | df479a2 Set iOS HockeyAppId
| | * | | d0c820d Integrated HockeyAppId from info.plist. Disabled AuthenticateInstallation call for current config.
| | * | | d0702fe Added iOS HockeyApp to the Info.plist file
| | * | | 05f627a Refactored the HockeySDK App ID to the AssemblyInfo file for Android
| | * | | f99cf8e Added HockeySDK update to Android
| | * | | d0c94d0 Added ability to enable HockeySDK User metrics in Android
| | * | | 2b14729 Disabled HockeySDK for iOS
| | * | | 32fa935 Integrated HockeySDK for Android to detect crashes
| | * | | 58017a5 Added HockeySDK NuGet package to Android solution
您在合并之前还原了提交，这将创建一个新的提交来撤消该提交。我想你想做的是 git reset 将分支引用重置为提交。
如果您想重置为合并任何内容之前的状态，您可以执行以下操作：
git checkout feature/profile_page
git reset --hard 663a378 这会将功能分支本地设置为合并提交之前的提交。在远程中，您必须执行 git push -f，这将重写您远程中的历史记录。如果你是唯一一个在分支机构工作的人，并且你有正确的权限，那就没问题了。
或者您可以在 663a378 git checkout -b 663a378 上创建一个新的功能分支，您可以使用它来执行您想要的合并。
根据您的日志，我认为最干净的解决方案是：
git checkout 663a3784ab82f019996a5091f3dfb2401c0403b5 -b feature_clean
这会将您标记为 "valid"（编辑之前）的合并之前的提交检出为新分支 "feature_clean"。然后你可以执行合并（git merge master）并确保它是干净的。最终，您可以用 feature_clean 替换特征，例如删除前者并重命名后者：
git branch -d feature # delete old branch
git branch -m feature_clean feature # rename clean branch
git push -f # force push feature to rewrite history on remote
我不建议 git reset 663a37... --hard 后跟强制推送的原因是这样可以保留 "broken" 分支并且可以根据需要经常执行 git checkout 663...它来解决冲突。
希望对您有所帮助。
这是重播您的提交的一种方法：
使用 "work in progress" 分支从提交
663a378重新启动：git branch wip 663a378 git checkout wip重新运行 "merge master into this branch" :
git merge master解决冲突，
并提交，可能编辑提交以将您期望的分支名称放入消息中（例如："merge master into feature/profile_page"而不是"merge master into wip"）如果您对这个新合并感到满意：将以前的分支移动到这些新提交中：
# push current commit to the remote "feature/profile_page" branch : git push -f origin wip:profile_page # set your local "profile_page" branch to this new commit : git branch -f profile_page wip # switch to other branch and delete wip : git checkout profile_page git branch -d wip