Fix for the 3 way merge tool not showing the Source (Remote) revision… #57
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… of the file, instead showing twice the Target (Local) revision. In case of a merge conflict, we need to put the tip of the "source (remote)" branch at the top of the history (index 0); it means that we need to keep this revision in the list of revision even if this is a revision higher than the head/changeset You can think of this as the simplest way to display the "merge in progress" in a 1D graph of the current branch (target) (as a future potential changeset, the same way we display the local changes yet to be submitted on the current branch)
We need to extract the file name without the " (Merge from <CS>)" postfix; PS C:\Workspace\UE5PlasticPluginDev> cm status Content --compact cs:139@rep:UE5PlasticPluginDev@repserver:test@cloud Modified items (CH = changed, CO = checked-out, CP = copied (new), RP = replaced) CO Content\NewFolder\BP_CheckedOut.uasset (Merge from 140)
SRombautsU
force-pushed
the
1002622-fix-conflict-3-way-merge
branch
from
bd39167 to
05a6ab3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
… of the file, instead showing twice the Target (Local) revision.
In case of a merge conflict, we need to put the tip of the "remote branch" on top of the history; it means that we need to keep this revision in the list of revision even if this is a revision higher than the head/changeset