Is there anything more fun than sitting down for a couple of hours and fixing a complicated #git rebase?
-
Is there anything more fun than sitting down for a couple of hours and fixing a complicated #git rebase?
-
ClickHouse CI :archlinux:replied to Scott Williams 🐧 last edited by
-
Scott Williams 🐧replied to ClickHouse CI :archlinux: last edited by [email protected]
@ClickHouseCI You'll clearly never needed to do it with large and complex XML files with evolving schemas then ;-). Loads of fun! Luckily, that wasn't my reality yesterday.
-
ClickHouse CI :archlinux:replied to Scott Williams 🐧 last edited by
@vwbusguy I learned the rebase process while solving conflicts in pom.xml
I migrated a big complex software on top of spring to create Deb files artifacts. The branch did leave around half of a year back in 2018. So I rebased it on a weekly basis to ease the conflicts resolution.
I have no fear of rebase anymore, it's only fun for me now ¯\_(ツ)_/¯
-
Scott Williams 🐧replied to ClickHouse CI :archlinux: last edited by
@ClickHouseCI Fair enough. I regularly do git pull --ff and rarely have to rebase unless I have multiple upstream repos.
Copyright © 2024 NodeBB | Contributors