ColaLinN / coding-tricks-collection

Record some minor tricks that I found in daily coding
0 stars 0 forks source link

[05] [GIT] Git pull rebase solves the problem of being unable to fast forward merge #5

Open ColaLinN opened 10 months ago

ColaLinN commented 10 months ago

https://stackoverflow.com/questions/62653114/how-can-i-deal-with-this-git-warning-pulling-without-specifying-how-to-reconci

git pull --ff-only
git pull origin main --rebase