Hi
Was there rebase done (accidentally or on purpose) in master branch lately?
I ask because typically fast forward merge just flys through without
excitement, but not this time:
---
$ git fetch
remote: Enumerating objects: 149, done.
remote: Counting objects: 100% (149/149), done.
remote: Compressing objects: 100% (11/11), done.
remote: Total 198 (delta 138), reused 147 (delta 137), pack-reused 49
Receiving objects: 100% (198/198), 43.82 KiB | 1.46 MiB/s, done.
Resolving deltas: 100% (144/144), completed with 48 local objects.
From github.com:kamailio/kamailio
+ a15210d06...ce8d36f30 master -> origin/master (forced update)
a7f6227ef..d36634a36 5.2 -> origin/5.2
$ git pull --ff-only
fatal: Not possible to fast-forward, aborting.
---
I did not forcefully merge local master yet, so my current local HEAD is:
---
$ git show HEAD
commit a15210d064e08ac8b1a271502360b7066bff43b6 (HEAD -> master)
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Date: Thu Mar 28 19:33:22 2019 +0100
app_lua: get lua execution stack for previous level
- returns the info where current function was executed
---
And my recently fetched origin/HEAD is:
---
$ git show origin/HEAD
commit ce8d36f301d7688255597a67693e47dc14448650 (origin/master,
origin/HEAD)
Author: Daniel-Constantin Mierla <mico...@gmail.com>
Date: Tue Apr 2 17:09:53 2019 +0200
lib/srdb1: use system time to compute db query execution duration
---
If I read "git log --graph --decorate" output correctly, their common ancestor
is:
---
* | commit 1b6332fe565d97695a1eb84172e6f19f26381101
| | Author: sergey-safarov <s.safa...@gmail.com>
| | Date: Wed Mar 27 10:43:42 2019 +0300
| |
| | ipops: Fixed mask for 172.16.0.0/12 network (#1907)
---
From github web interface I can load same commit as is my local HEAD:
https://github.com/kamailio/kamailio/commit/a15210d064e08ac8b1a271502360b7066bff43b6
And it looks that commit is also known as:
https://github.com/kamailio/kamailio/commit/fb99f748db187d2699b6c050cf16f3f54d08ee47
I try to figure out if something is happening on my end, but meanwhile I must
ask
is it just me or did anyone else exprience this?
Best regards
--
Mikko
_______________________________________________
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
