[wip] Integrated merge tool #988
Draft
+260
−1
Conversation
This file contains hidden or 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
wl2776
force-pushed
the
feature/merge-tool
branch
from
13b6865 to
e8fcd6f
Compare
love-linger
force-pushed
the
develop
branch
5 times, most recently
from
ed356cd to
2a43efd
Compare
|
Any plans to finish this? |
Sorry, currently no plans |
love-linger
force-pushed
the
develop
branch
6 times, most recently
from
05dba32 to
6822ae3
Compare
love-linger
force-pushed
the
develop
branch
3 times, most recently
from
072502a to
5ce919a
Compare
love-linger
force-pushed
the
develop
branch
5 times, most recently
from
f325aaf to
6511d15
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.
Attempt to resolve #892
Currently it displays conflicted content.
However, scroll bars, line numbers and styles are absent, and I cannot figure out how to make them appear.
I was looking at
TextDiffViewfor code samples.@love-linger, could you look and advice a direction on how to make them to appear?