Re:Git Workflow Basics
by falsedan on Wednesday August 17, 2016 @05:56PM
(#12308789)
This is FUD. Many people use git-rebase flawlessly, without any of the issues you've encountered.
Wouldn't your tests catch when lines get elided by manual merge conflict resolution? Have you see mjd's Git Habits[0], which lays out a foolproof way of rebasing without losing lines?
Wouldn't your tests catch when lines get elided by manual merge conflict resolution? Have you see mjd's Git Habits[0], which lays out a foolproof way of rebasing without losing lines?
[0] http://blog.plover.com/prog/git-habits.html