Facing merge problem in tortoisehg

Hello, 

I am beginner in tortoisehg. I want to merge two branches.

For that I write something like this.,

 - "hg config merge-patters"
   to make sure no merge rules are set
 - "hg merge --tool :fail --debug 19"   //19 is my experiment branch
   (i.e. run the merge with --debug option)

and conflict generated and merge done successfully.  

 

Now when I am doing this by., right click revision->press merge with local and do merge then, conflict is not generated. Why??

And resulted revision (after merge with default branch), is same as default branch.

Why this is so?

Please suggest.

 

Regards

Utsavi Bharuchwala

 

 

 

0 answers

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 06, 2018 in Bitbucket

Do you use Bitbucket Cloud and Jira Cloud? If so, let us know!

Hi Community, I'm Julia and I'm on the Jira Software Cloud marketing team!  We're looking for companies or teams using Bitbucket Cloud and Jira Software Cloud. If your team fits the t...

174 views 6 3
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you