Specify insert order for fragments
In P4Merge, if I select multiple colored icons in the right-hand pane while holding SHIFT (the blue icon corresponds to 'theirs' file, yellow - to 'base' and green - to 'mine'), all the corresponding fragments are inserted into the result:
But, the order of the insertion seems to be constant: first 'base', then 'theirs', and finally 'mine'. The order in which I select the icons doesn't affect the result.
Can I somehow change this insertion order? (Save for editing the result by hand, of course.) E.g. I'd like to insert 'theirs' fragment after 'mine'.
The tool version here is P4Merge/NTX86/2012.1/475402 .
Solution
No, this is not configurable. Copying+pasting is the best workaround.
- How can I quit an in-progress git merge operation in VS Code?
- Merge a Branch in VSS: You cannot perform a merge on a binary file, or a file that stores latest version
- How to undo merge of master branch?
- Add label or failing check to Pull Request with (merge) conflict on GitHub?
- Git merge does not take all files from source branch
- pandas- merge to datasets with diff col names adding values from the second into the first
- GitHub pull request showing commits that are already in target branch
- How to Merge Two PDF Files Using jsPDF
- When merging JSON objects with same keys, how do I append their values?
- git merge a single file....and a TRUE 3-WAY MERGE, not just a checkout of ours vs theirs which doesn't consider common ancestor
- How can I set up Git branch for automatic backups
- Getting index out of bounds error in leetcode when I'm not out of bounds
- Merge two dataframes with only one column
- 88. Merge Sorted Array
- Apply pandas function to column to create multiple new columns?
- How to merge two xml files at a specific level
- How to make a Git custom merge driver automatically stage resolved files?
- Pandas - Create new column w/values from another column based on str contains
- Combine/merge lists by elements names
- Git merge two local branches
- Merging two sorted linked lists in Python
- Merge M4A files in Terminal
- git merge repeating conflicts
- Merge branches without checking out branch
- Polars Dataframe full-join (outer) on multiple columns without suffix
- Pull a certain branch from the remote server
- How to merge two datasets by column value, including all new columns from both datasets and including NA values?
- Git: What's would be the correct way of merging (or rebasing) code based on an old commit/tag that was not being tracked by git?
- How to merge Dictionarys from typescript-collection?
- Nearest date between 2 column dates, generate new column