4 ms·
You are more brave than I am - I have it explicitly disabled :-) https://gitlab.com/dnsmichi/dotfiles/-/blob/main/.gitconfig https://gitlab.com/dnsmichi/dotfil
by dnsmichi 4y ago
You are more brave than I am - I have it explicitly disabled :-) https://gitlab.com/dnsmichi/dotfiles/-/blob/main/.gitconfig https://gitlab.com/dnsmichi/dotfiles/-/blob/main/.gitconfig
When I pull and it runs into a merge conflict, I want to see that error/log on the CLI. Reason: Sometimes the automated pull-rebase takes a very long time to resolve conflicts after each step. I prefer to first run
git fetch
git diff branchname origin/branchname
and then decide my strategy :)
Bit off-topic but since we share .gitconfig tips - I upgraded to a recent Git version and enabled the "git push" option to setup tracking automatically. No more "git push -u origin branchname" actions. https://gitlab.com/dnsmichi/dotfiles/-/blob/main/.gitconfig#L19 https://gitlab.com/dnsmichi/dotfiles/-/blob/main/.gitconfig#...
[push]
autoSetupRemote = true