3 ms·
Major: A new default merge strategy > In Git 2.34, ort is now the default merge strategy, so you should notice faster merges with fewer bugs just by upgrading
by jakub_g 5y ago
Major: A new default merge strategy
> In Git 2.34, ort is now the default merge strategy, so you should notice faster merges with fewer bugs just by upgrading
> a rewrite allowed Git to implement a merge strategy that doesn’t operate on the index
- thriftwy 5y agoGit is awesome but it would really be great if they sunsetted merge instead of putting lipstick on it. Merge of two good commits will silently produce bad commit. Merges are not repeatable and can't be reasoned about. Merges get in a way of git bisect. Merge makes simple "git log" not contain all the log. Good luck cherry-picking a merge commit. Merge makes a commit which has important changes not apply to any specific revision of git log. It's an enormous foot gun and a single contributor may inadvertenly taint your repository for life. Merge is a make-believe working set operation, like if you could pretend to add apple to mango and get a pomelo. Merge is VCS analog of lead acetate. Something you have no reason to ever put in your mouth.
- joconde 5y agoHow else could we take two diverging branches and mix them back into one?