abort: push creates new remote heads!

[Martin Marques]

Joseph Turian wrote:
> Help! I am using mercurial to do development with several other persons. 
> I didn't early enough, and now my repository is in a state from which I 
> am not sure how to recover:
> 
> ==========
> 
> turian at grenat:~/dev/theano 1$ hg push
> pushing to ssh://[...]
> searching for changes
> abort: push creates new remote heads!
> (did you forget to merge? use push -f to force)
> turian at grenat:~/dev/theano 1$ hg pull
> pulling from ssh://[...]
> searching for changes
> adding changesets
> adding manifests
> adding file changes
> added 1 changesets with 1 changes to 1 files (+1 heads)
> (run 'hg heads' to see heads, 'hg merge' to merge)
> turian at grenat:~/dev/theano 1$ hg update
> abort: crosses branches (use 'hg merge' or 'hg update -C' to discard 
> changes)
> turian at grenat:~/dev/theano 1$ hg merge
> abort: outstanding uncommitted changes

$ cd ..
$ hg clone theano theano-merge
$ cd theano-merge
$ hg merge
$ hg ci
$ cd ../theano
$ hg pull ../theano-merge

You should be good from there on.