Re: Can't update after pulling

[Sahil]

Dildar Sk wrote
> updating to active bookmark @
> abort: not a linear update
> (merge or update --check to force update)

you have divergent heads due to your own local changes. You can get through
this if you try to go back in commits and keep in line with the default
branch as follows:
1.) First execute `hg graph --all` and then stop the process. Look for your
local head in the DAG that just appeared.
2.) Note down the rev number 'x' through which your divergent head
originates (this rev is *in* the default branch).
3.) execute `hg up -r x` which will update your repo a few commits back
depending on the amount of commits that you have made locally.
4.) execute `hg up`. This shuold update your repo to the latest pull leaving
behind your local work. Moreover, if you think your local changes are
not-so-useful, then you can simply `hg strip` that head to rev x.




--
Sent from: http://octave.1599824.n4.nabble.com/Octave-General-f1599825.html