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?
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 ...
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!
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
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot