10 Mar
2021
10 Mar
'21
11:39 a.m.
I think the main problem is the confusing merge commit message. Have a look to this page: https://sip-router.org/wiki/git/quick-start-guide
-> by default perform a rebase instead of a merge when pulling into the local master branch (highly recommended, it gets rid of a lot of confusing merge origin/master messages). It's equivalent to adding –rebase to git pull command line. (recommended)
git config branch.master.rebase true
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/2666#issuecomment-795293251