I am a strong advocate of good practices and the use of technology for virtuous purposes. I strive to encourage local resilience (see transitionnetwork.org), low tech and agro-forestry.
Hi Thibaut, I recommend git pull --rebase=merges to preserve the "bumps" of local merges or better yet, do it automatically at pull by configuring it by default: git config --global pull.rebase merges.
French software engineer with 15 year experience on 3D data visualisation and processing. Lots of C++, and switch to Unity recently.
I like when it run fast 😉
I try to avoid local merge. If you have a local merge, it means you have a dependency on another branch, so it means a feature branch has lived too much time on its own and should have been merged sooner. But yeah, theory and practice...
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
Hi Thibaut, I recommend
git pull --rebase=mergesto preserve the "bumps" of local merges or better yet, do it automatically atpullby configuring it by default:git config --global pull.rebase merges.Oh gosh, I wish I had knew this option sooner 😀
I try to avoid local merge. If you have a local merge, it means you have a dependency on another branch, so it means a feature branch has lived too much time on its own and should have been merged sooner. But yeah, theory and practice...