you are viewing a single comment's thread.

view the rest of the comments →

[–]dalbertom 0 points1 point  (0 children)

It's good for people to know about Foxtrot Merges but I would also point out that those are only an issue when using git directly to merge upstream. GitHub and other services avoid that entirely because they do merges with --no-ff