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.
- Squash a merge commit with a previous commit
- How do you see / show a git merge conflict resolution that was done, given a merge commit SHA1?
- What git commit practice is better?
- Merge two tables with same column names, add counters
- Git: Why does rebase result in conflicts while merge does not?
- How do you merge two Git repositories?
- Best way to determine unmerged branches in a script
- Among many subfolders, find CSVs starting with a given string and within ZIPs or not, and merge them while adding their names in a new column with R
- Merging CDC Updates Into Snowflake With Varying Updated Columns
- Restore git history from split repositories
- Git merge with force overwrite
- How to merge JSON using JMESPATH?
- Configuring a diff-tool for Git on Windows
- Is it possible to find all commits that origin/master pointed to at some point in history?
- Merging multiple csv files in java
- how do i create a merge request from a fork in gitlab
- Merge rows of two 2d arrays based on shared column values
- Left join using data.table
- Merge/flatten an array of arrays
- Use MERGE with CTE
- Debugging algorithm that merges two lists that are already sorted using circular shifts
- Append the keys of an associative array as values of another array
- How to redo a merge conflict resolution (before committing the merge)?
- Merge PHP const arrays to new const array without nesting
- Error "Updates were rejected because the remote contains work that you do not have locally"
- How to untar multiple files with an extension .tar.gz.aa, .tar.gz.ab..... in windows?
- different deleting OUTPUT behaviour based on source table
- Gitlab CI Pipeline that runs after merge is done
- in jq, how to merge an array of object into 1 object with an array of values
- Deep merge dictionaries of dictionaries in Python