Update with uncommitted changes?

[Marius Kruger]

hi,

I also had this recently where people push over sftp:// to a [bound branch].

Is it possible to push these pending merges to the [master branch]?
The only way I could figure out to not merge, it to get them to push
to the [master branch] an then update again on the [bound branch].
I guess, we could have just merged them in, but I don't like pointless
merges too much.

It was a little confusing though, until we figured out what happened.

regards
marius

On Jan 23, 2008 6:56 AM, Matthew D. Fuller <fullermd at over-yonder.net> wrote:

> I was somewhat surprised to find out that 'update'ing a checkout with
> local commits and uncommitted changes goes ahead and does the pending
> merge conversion.  ISTM that it should complain and require forcing,
> just like merge requires sweet-talking to merge into a tree with
> uncommitted changes.  Is this an explicit choice, or just fallout from
> how it was written?
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20080124/e56d4b47/attachment.htm