Crell, 15 days ago Never* use git pull. https://youtu.be/xN1-2p06Urc #Programming
Never* use git pull.
https://youtu.be/xN1-2p06Urc
#Programming
salcode, 14 days ago @Crell I’m a fan of setting git config --global pull.ff only and continuing to use git pull Then if I hit the situation from the video where there are new commit(s) on the remote, #git stops the merge and displays a message. At that point I can decide how to handle it. Long version at https://salferrarello.com/git-warning-pulling-without-specifying-how-to-reconcile-divergent-branches-is-discouraged/
@Crell I’m a fan of setting
git config --global pull.ff only
and continuing to use git pull
Then if I hit the situation from the video where there are new commit(s) on the remote, #git stops the merge and displays a message. At that point I can decide how to handle it.
Long version at https://salferrarello.com/git-warning-pulling-without-specifying-how-to-reconcile-divergent-branches-is-discouraged/
Crell, 14 days ago @salcode I've done that as well at times, though my muscle memory still has me typing pull --rebase all the time. 🙂
@salcode I've done that as well at times, though my muscle memory still has me typing pull --rebase all the time. 🙂
pull --rebase
Add comment