somerandomperson@lemmy.dbzer0.com to Programmer Humor@programming.dev · 2 days agowe did a little bit of branch fuckerylemmy.dbzer0.comimagemessage-square21fedilinkarrow-up1766arrow-down15
arrow-up1761arrow-down1imagewe did a little bit of branch fuckerylemmy.dbzer0.comsomerandomperson@lemmy.dbzer0.com to Programmer Humor@programming.dev · 2 days agomessage-square21fedilink
minus-squareEveryday0764@lemmy.ziplinkfedilinkarrow-up24·2 days agoin the projects i work in i always try to force semi linear history to avoid all of this, never merge (unless it’s the MR) always rebase. this leaves a very readable history, with each feature branch highlighted and no mixture in the commits… i haven’t found any downside yet… maybe that some ci/cd are built to push to main, but making them do branch pr automerge is not that difficult
in the projects i work in i always try to force semi linear history to avoid all of this, never merge (unless it’s the MR) always rebase.
this leaves a very readable history, with each feature branch highlighted and no mixture in the commits…
i haven’t found any downside yet… maybe that some ci/cd are built to push to main, but making them do branch pr automerge is not that difficult