hi,<br><br>I also had this recently where people push over sftp:// to a [bound branch].<br><br>Is it possible to push these pending merges to the [master branch]?<br>The only way I could figure out to not merge, it to get them to push
<br>to the [master branch] an then update again on the [bound branch].<br>I guess, we could have just merged them in, but I don't like pointless merges too much.<br><br>It was a little confusing though, until we figured out what happened.
<br><br>regards<br>marius<br><br><div class="gmail_quote">On Jan 23, 2008 6:56 AM, Matthew D. Fuller <<a href="mailto:fullermd@over-yonder.net">fullermd@over-yonder.net</a>> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
I was somewhat surprised to find out that 'update'ing a checkout with<br>local commits and uncommitted changes goes ahead and does the pending<br>merge conversion. ISTM that it should complain and require forcing,
<br>just like merge requires sweet-talking to merge into a tree with<br>uncommitted changes. Is this an explicit choice, or just fallout from<br>how it was written?<br></blockquote></div><br>