现在将 FeatureBranch 合并到 Dev 的最佳方法是什么? 我很想在放荡开始之前强制推送到 FeatureBranch,然后再次尝试合并,希望有不同的行为。我们是一个小团队,本地变化很少,所以我们可以很容易地适应改变的起源历史,但是,如果可能的话,我还是想避免强制推动。
git日志;我在本地重置为 f0e83d1:
* ae2bf73 (origin/Dev, Dev) Merged in undo22 (pull request #23)
|\
| * d0292f4 (origin/undo22) Revert "Merge FeatureBranch to Dev (pull request #22)"
|/
* 78e4c0f Merged in FeatureBranch (pull request #22)
|\
| * 3c2f132 (origin/FeatureBranch) Re-adding accidentally reverted change.
| * f586c2e Revert "Merge branch 'Dev' into FeatureBranch"
| * e996bcc Revert "#IC-67 #IC-179 [Redacted]"
| * d5de75c Merge branch 'Dev' into FeatureBranch
| |\
| * | f0e83d1 (HEAD -> FeatureBranch) #IC-67 #IC-179 [Redacted]