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
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

1,760 views 1 5
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