HAHoussem BEN ABDALLAH@hbenabdallah·Oct 2003bcfa2Stop using git merge to rebase or fix conflicts 😠 Seriously, stop running git merge main in your branches to “stay up to date”. Your history looks like a bowl of noodles, and deep down you know it.14:30 · Oct 20, 2026 · commit 03bcfa23QuoteTranslateReplyHide repliesSMStephan Meijer@smeijer·Oct 20Joke's on you. I just merge while preserving conflicts.2TranslateReply
SMStephan Meijer@smeijer·Oct 20Joke's on you. I just merge while preserving conflicts.2TranslateReply