tortoiseHG not asking for merge anymore

[Matt Mackall]

On Mon, 2015-07-20 at 09:10 +0000, FLORENT Philippe wrote:
> Hello,
> 
> I have setup a hg rep on a server
> 
> At first when I pushed changes to the repo, as I had conflict with modifications done by my collegue,
> 
> Tortoise was displaying a merge/diff window
> 
> But after a couple of push, it does not do that anymore
> 
> So my changes and the one of my college are never merged, but just added to revision history

This list is for the command line tool 'hg' that the third-party tool
TortoiseHg is based on. Most of us know nothing about TortoiseHg.

But I suspect you or your colleague "forced"[1] a push and thus created
two heads on the server. This will show up as a forked history when you
pull. If that's the case, you'll want to merge, commit, and push.

[1] Forcing things in Mercurial, much like in life, usually leads to
regrets.
-- 
Mathematics is the supreme nostalgia of our time.