(switched to tortoisehg-discuss, please CC the list)
On Mon, 11 Sep 2017 16:42:29 +0530, utsavi bharuchwala wrote:
> I create a two branch within same repository.(default and
> ExperimentBranch)having different code commited (not pushed).
>
> I want to merge code of this two branches. Say I commited first default
> branch,
>
> Say I have 2 files A and B
>
> Branch Name: defalt
> FileName-Content: A - Addition func
> B - Subtraction and multiplication func
>
> Now I altered the containt like.,
I assume you've updated to the parent revision before creating new branch.
1---2 (default)
\
------3 (ExperimentBranch)
> Branch Name: ExperimentBranch(created a new branch)
> FileName-Content: A - Subtraction and multiplication func
> B - Addition
>
> Update Default branch and then merge ExperimentBranch with Default then, I
> observed like,
>
> Branch Name: default (merge with ExperimentBranch)
> FileName-Content: A - Subtraction and multiplication func
> B - Addition
>
> There is no conflict generated...!! Merge Resolver is not event asking me
> to select merge resolver.
Strange. Which function did you use for merging? What options were enabled?
Please copy-paste the output log of the merge dialog.
> It seems the Default branch code is replace
> <https://stackoverflow.com/questions/46151441/tortoisehg-merge-is-replacing-a-code#>d
> by the ExperimentBranch code, instead of merging.
>
> What I want is, File A content-> Addition, Subtraction and Multiplication
> function
>
> File B content-> Addition, Subtraction and Multiplication function
>
> Can you suggest me how to do this??
------------------------------------------------------------------------------
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
