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
Community showcase
Published Nov 06, 2018 in Bitbucket

Upgrade Best Practices

Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...

198 views 3 6
Read article

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