GIT合并发展成功能分支 - 在合并并恢复同一分支之后
我的合并状况非常棘手，希望有人可以帮助我。
一段时间以前，将功能分支合并为发展。 由于发行不需要该功能，因此合并被恢复。 同时，将更多的特征分支合并为开发。
现在，是时候将同一功能分支重新合并到开发中了。 正如预期的那样，当我尝试这样做时，git会注意到我的更改已被删除，因此它会自动删除这些文件/更改，这些文件/更改是我本地功能分支机构中原始合并的一部分。
有没有办法解决此问题：合并/折叠发展到我的功能分支中，但要保留我所有的更改？
I am in a pretty sticky situation with a merge, I hope someone can help me.
A feature branch was merged into develop some time ago, all good.
Because that feature was not required for a release, the merge was reverted.
In the meantime some more feature branches were merged into develop.
Now, it is time to re-merge the same feature branch into develop.
As expected, when I try to do that, git will notice that my changes were deleted, so it automatically deletes those files/changes that were part of the original merge in my local feature branch.
Is there a way to fix this: merge/rebase develop into my feature branch, but keeping all my changes?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
好的，这比我想象的要容易：
Ok, it was easier than I thought: