<p>Committing changes that you are not aware of it's not a good thing, because it can break exiting code. Somehow you changed ims_dialog-create.sql and if we don't know why you did it, then it cannot be merged. You can use "git status" before any commit to see what files are affected by the commit.</p>

<p>Regarding the removal of outbound_proxy, I see that it was set in a structure. Have you checked that the structure is not passed to the dependency modules like tm, sl where the field might be used?</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/kamailio/kamailio/pull/762#issuecomment-243413017">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AF36ZXOw2g5tBZishHihIgp1fGc9Optjks5qlBcngaJpZM4JvpVO">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/AF36ZQsfZp1yuzwSecS6FFnJdCZ4XcoAks5qlBcngaJpZM4JvpVO.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/kamailio/kamailio/pull/762#issuecomment-243413017"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>

<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/kamailio/kamailio","title":"kamailio/kamailio","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/kamailio/kamailio"}},"updates":{"snippets":[{"icon":"PERSON","message":"@miconda in #762: Committing changes that you are not aware of it's not a good thing, because it can break exiting code. Somehow you changed ims_dialog-create.sql and if we don't know why you did it, then it cannot be merged. You can use \"git status\" before any commit to see what files are affected by the commit.\r\n\r\nRegarding the removal of outbound_proxy, I see that it was set in a structure. Have you checked that the structure is not passed to the dependency modules like tm, sl where the field might be used?"}],"action":{"name":"View Pull Request","url":"https://github.com/kamailio/kamailio/pull/762#issuecomment-243413017"}}}</script>