Conversation

Notices

1. Santa Claes 🇸🇪🇭🇰🎅 (clacke@libranet.de)'s status on Wednesday, 01-Dec-2021 13:33:48 UTC Santa Claes 🇸🇪🇭🇰🎅

   • Santa Claes 🇸🇪🇭🇰🎅
   In retrospect it would have been smarter to just roll back the change the right way and then reapply it later when the sprint was over as I had planned before I absentmindedly "oh look approved PR, merge".
   • Santa Claes 🇸🇪🇭🇰🎅 (clacke@libranet.de)'s status on Wednesday, 01-Dec-2021 13:27:07 UTC Santa Claes 🇸🇪🇭🇰🎅
     I merged a cross-cutting thing when several people had branches open and I've been managing merge conflicts for two days.
     
     Seriously interested now to check out whether pijul actually handles this kind of thing better in practice.
     
     pijul.com/manual/conflicts.htm…
     
     #git #pijul #MergeConflict #TheoryOfPatches
     LinuxWalt (@lnxw48a1) {3EB165E0-5BB1-45D2-9E7D-93B31821F864} likes this.
   • Santa Claes 🇸🇪🇭🇰🎅 (clacke@libranet.de)'s status on Wednesday, 01-Dec-2021 13:37:22 UTC Santa Claes 🇸🇪🇭🇰🎅

     in reply to
     Solving merge conflicts is a puzzle and detective game, and it's easy to make yourself believe it's important, when you could actually avoid it by playing the higher-level puzzle game of just not introducing that conflict at that time.