2 ms·
Good points. Two issues: (1) All code review tools I know of currently use merges http://programmers.stackexchange.com/q/256789/108980 http://programmers.stac
by paulddraper 11y ago
Good points.
Two issues:
(1) All code review tools I know of currently use merges http://programmers.stackexchange.com/q/256789/108980 http://programmers.stackexchange.com/q/256789/108980
(2) If you want to keep your local work up-to-date, you need to rebase. It can be painful to do this after a while; many like to do it often. If you have a conflict, you will need to resolve it everytime you rebase, unlike merge, which saves the conflict resolution in the merge commit. You can use git rerere, though it takes some effort https://git-scm.com/docs/git-rerere https://git-scm.com/docs/git-rerere