I see something wrong git log in kamailio history. If you execute "git log" in the command line and scroll down, then the first commit will be
commit 46737c269ae290c29639ab1a5e66e4cf1637556e (grafted) Author: Daniel-Constantin Mierla <[email protected]> Date: Tue Dec 9 11:49:53 2025 +0100 db_redis: use set max fetch for result to 1000 when *keys_count == 1000 - GH #4511 And no ability to view older commits. Also, when I rebase my local master branch on upstream/master then I see an error safarov@nout:~/kamailio-upstream$ git rebase upstream/master Auto-merging Makefile CONFLICT (add/add): Merge conflict in Makefile error: could not apply e60a9728a5... First working release hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". hint: Disable this message with "git config set advice.mergeConflict false" Could not apply e60a9728a5... # First working release Question, maybe we need fix git history and force push master branch?
_______________________________________________ Kamailio - Development Mailing List -- [email protected] To unsubscribe send an email to [email protected] Important: keep the mailing list in the recipients, do not reply only to the sender!
