(moved to the users list)
On Mon, 7 May 2018 05:57:11 -0700 (PDT), [email protected] wrote:
> Is it possible in TortoiseHg to merge only some file from one branch to
> another?
>
> Lets say I have 2 winforms in my project in branch B and I want to only
> merge one of those winforms to branch A.
> Is that possible?
If you just want to discard one change from the branch B forever in
the branch A, yes, you can.
1. Run merge without "Automatically resolve ..."
2. Click ... "resolved" link while merging to open "Resolve Conflicts" dialog
3. Move up the file you wan to discard the change by clicking "Mark as
Unresolved" if needed
4. click "Take Local" to take the branch A version.
------------------------------------------------------------------------------
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
