(Again, please don't remove the list address from CC) On Fri, 15 Sep 2017 12:26:34 +0530, utsavi bharuchwala wrote: > Thanks for understanding my problem. > > Yes, I write the commands as per you suggest. Below are the Snap attached, > indicating the process of merge debug.
Can you run these commands in TortoiseHg Console? (Workbench -> View -> Show Console) > Yes, after writing the 'hg resolve --all' ,conflict of merge is > solved...!!(As per my desire..developing branch is merged with default > branch and conflict generated...results is no more same as default branch). > > This is going to work but, why doing manual merge(by right click on > revision->merge with local) is not working? No idea. TortoiseHg should run exactly the same command (without --debug flag.) > Why there is a Picked tool fail command is coming? Whats going wrong here? > Can you suggest. It's set by default unless you select the "automatically resolve merge conflicts where possible" option. > From screenshot, if you have any idea about this then please suggest me. > > One more thing you suggest me, if I can prepare a public repo in which the > problem > can be reproduced , but where I can place my problem repo? Plase suggest. Er, bitbucket, for example. Email attachment should also be okay as long as the file is small. ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
