<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2666
-- Commit Summary --
* Merge pull request #1 from kamailio/master * Merge pull request #2 from kamailio/master * Merge pull request #3 from kamailio/master * lrkproxy:fix flag parameter in change_media_sdp * Merge branch 'lrkproxy_warning2663'
-- File Changes --
M src/modules/lrkproxy/lrkproxy.c (15)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2666.patch https://github.com/kamailio/kamailio/pull/2666.diff
Merged #2666 into master.
@mojtabaesfandiari - you merged a lot of changes for what should have been a small patch.I reverted your pull request. Do not merge commits that affect other components (core, lib, modules) than your specific module.
What did you try to do?
Sorry, Actually i have done my changed related to issue#2663 on my fork, then i just tried to merge my master branch with orgin master. Let me know what should i do in this situation?
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
@henningw Thanks for helping. @miconda Thank you