![]() Merge Command: C:\Program Files\WinMerge\WinMergeU.Options > Diff > External Diff / Merge:.The options I used in Sourcetree 3.4.3 for Windows 64-bit with WinMerge 2.16.10.0 圆4 and which worked for merging: Currently working custom merge options for WinMerge: I tried today () using WinMerge 3-way merge with the custom merge option using the information from this Sourcetree Community question and it worked okay. tisdag Revert a merge commit using SourceTree Update 1 (no need to investigate the parents) The use case I need this for is when a feature branch has been merged to master, and after that something arises that makes us want to remove that feature from the master branch again. But as of WinMerge has supported 3-way merge (See WinMerge 2.15.2 changelog from : "Add support for 3-way compare/merge"). ![]() The bug SRCTREEWIN-4572 ("Can't select WinMerge as merge tool") from 2016 was closed because WinMerge didn't yet support a 3-way merge. WinMerge is available in the "Options > Diff > External Diff / Merge > Merge Tool" dropdown box and merging using it works.īackground / related issues: Related bug: WinMerge is not available in the "Options > Diff > External Diff / Merge > Merge Tool" dropdown box. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent.Please could you add WinMerge to the merge tool selection as it has supported 3-way merge since early 2018? Thank you! Current situation (Tested on Sourcetree 3.4.3 Windows 64-bit): Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. Is a merge but no M option was given cherry pick? For more information, see “Merging a pull request.”
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |