Problem with Merge mixing up my data

[Haszlakiewicz, Eric]

>-----Original Message-----
>From: mercurial-bounces at selenic.com [mailto:mercurial-bounces at selenic.com]
>
>I like hg most of the time, but I've run into a situation that I keep
>messing up my merges and would love to know the way to merge without that
>happening.  Specifically, what I keep doing I finding my commit off on it's
>own branch as shown in the picture in the jpg below.  Then, I've tried all
>kind of "wrong" things in the tortiesehg client that ends up giving me "not
>the latest" changes in the top of the three and my local directory of files
>is a few iterations old.

That sounds like you need to do an update.  It doesn't matter which branch you're on, whether it's the branch that "goes no where" (as you have in your jpeg), or the tip, but once you're sitting at the head of either branch you should be able to right click the other branch and select "Merge with".

eric