git 逐块合并
我正在 git repo 上使用 master 和开发分支对网站进行一些私人（孤独）开发。我在开发分支上做了相当多的工作，重点关注一些“大”功能和问题，说实话，开发分支上的提交并不是原子提交的展示。这已经完成了（在一些大的差异中），但现在一些主要功能停止工作。 它停止工作的原因可能有很多，主分支和分支之间的差异包括某些文件的大量更改。
现在我想将开发分支一块一块地合并到主分支（或主分支的分支）中，并检查是什么破坏了我的主要功能。
有没有一种简单的方法可以用 GIT 来实现这一点？我也对其他选择持开放态度。我首选的 IDE 是 emacs，但我再次对经济实惠的替代方案持开放态度。
问候， 杰罗恩.
I'm doing some private (lonely) development of a website on a git repo with a master and a development branch. I've done quite some work on the dev branch focusing on some "big" features and issues, and to be honest the commits on the dev branch have not been a showcase for atomic commits. That is finished (in a few large diffs) but now some major feature stopped working.
The reasons why it has stopped working may be numerous, the diff between master and branch consists of numerous changes in some files.
Now I would like to merge the development branch piece by piece into the master (or a branch from master), and check what did break my major feature.
Is there an easy way of conceiving this with GIT? I'm also open to other alternatives. My preferred IDE is emacs but again I'm open for affordable alternatives.
regards,
Jeroen.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
git-bisect 旨在解决这个问题问题。
您首先将当前版本标记为“坏”，然后将您知道有效的版本（例如，您的分支分叉的点）标记为“好”，然后它可以帮助您进行二分搜索以准确找到问题所在的位置。
git-bisect is designed to solve this exact problem.
You start by marking the current revision as bad, then marking a revision that you know works (e.g., the point where your branch diverged) as good, and then it helps you do a binary search to find where precisely the problem was introduced.
您可以使用 git-rebase -i 以交互方式拆分您的过大的提交。手册页解释了这种具体情况。
You can use git-rebase -i to interactively split your oversized commits. The man page explains this exact situation.