feat: render conflict actions #2002
Merged
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
Aaaaash
approved these changes
Nov 23, 2022
Ricbet
added a commit
that referenced
this pull request
Nov 23, 2022
* feat: implement conflict actions base code * chore: improve code
Ricbet
added a commit
that referenced
this pull request
Nov 23, 2022
* feat: implement conflict actions base code * chore: improve code
Ricbet
added a commit
that referenced
this pull request
Nov 28, 2022
* feat: implement conflict actions base code * chore: improve code
Ricbet
added a commit
that referenced
this pull request
Nov 30, 2022
* feat: implement conflict actions base code * chore: improve code
Ricbet
added a commit
that referenced
this pull request
Dec 1, 2022
* feat: implement conflict actions base code * chore: improve code
Ricbet
added a commit
that referenced
this pull request
Dec 19, 2022
* feat: implement conflict actions base code * chore: improve code
Ricbet
added a commit
that referenced
this pull request
Dec 20, 2022
* feat: implement conflict actions base code * chore: improve code
Ricbet
added a commit
that referenced
this pull request
Dec 20, 2022
* feat: implement conflict actions base code * chore: improve code
Ricbet
added a commit
that referenced
this pull request
Dec 21, 2022
* feat: implement conflict actions base code * chore: improve code
Ricbet
added a commit
that referenced
this pull request
Dec 22, 2022
* feat: implement conflict actions base code * chore: improve code
Ricbet
added a commit
that referenced
this pull request
Dec 27, 2022
* feat: implement conflict actions base code * chore: improve code
Ricbet
added a commit
that referenced
this pull request
Dec 28, 2022
* feat: implement conflict actions base code * chore: improve code
erha19
pushed a commit
that referenced
this pull request
Dec 28, 2022
* feat: implement 3-way prototyping code * feat: implement compute diff * feat: add underline widget * fix: context key service error * feat: improve code & implement 3 editor model * chore: improve code & implement render different color * chore: improve code * chore: implement scroll change sync * chore: improve code * feat: implement inner changes decoration render (#1987) * fix: result editor view line widget render error * feat: implement inner changes char decoration render * chore: improve code * refactor: merge editor cyrcle deps (#1992) * refactor: merge editor cyrcle deps * fix: model * feat: implement stickiness connect effect (#1994) * feat: draw stickiness connect piece * feat: implement stickiness-connect move position * chore: rebase * chore: improve code & fix zonewidget * chore: improve code * feat: alternate margin and code view (#1995) * feat: render conflict actions (#2002) * feat: implement conflict actions base code * chore: improve code * feat: implement conflict actions operations (#2014) * feat: implement conflict actions operations * feat: implement conflict actions operations * refactor: decorations type * fix: conflict-actions * chore: improve code * refactor: document mapping * chore: rename type * chore: add note * fix: type * feat: implement conflict ignore actions operations (#2031) * feat: implement conflict ignore actions operations * chore: remove useless file * feat: implement dashed decorations render (#2033) * feat: implement dashed line render * chore: improve code * feat: implement editing result view code update range mapping (#2042) * fix: render dashed in accept current conflict * feat: implement editing result view code update range mapping * fix: result editor view update decorations * style: beauty merge editor diff range (#2046) * feat: implement revoke conflict actions (#2065) * refactor: conflict actions * feat: result view editor conflict action render * chore: add revoke icon * feat: implement revoke actions * fix: delta edits * feat: implement contiguous region merge range (#2076) * refactor: diff line range render * feat: improve diff merge range render * chore: improve code * feat: implement accept combination conflict actions (#2079) * feat: implement accept combination render * feat: implement accept combination actions * chore: improve mark complete code * chore: improve code * feat: improve conflict action (#2082) * fix: turn direction status * fix: range touch condition * chore: improve actions update render & fix revoke actions * feat: implement append action render & fix mapping data * chore: rename sameRange symbol * style: improve append icon * feat: implement accept append action * chore: remove console * fix: merge editor options (#2038) * fix: merge editor options * fix: merge editor options Co-authored-by: qingyi.xjh <qingyi.xjh@antgroup.com> * fix: accept combination apply edits error (#2085) * fix: accept combination apply edits error * chore: improve code * feat: support open from git scm (#2094) * feat: show title head info & implement the apply actions (#2095) * feat: implement title head & fix scroll & keep view state * feat: implement apply action * fix: time machine record * docs: apply button i18n * chore: improve code * fix: ci * fix: add merge editor mock test * fix: ci * style: use css module (#2101) * fix: e2e test * chore: add test * chore: add tst Co-authored-by: 大表哥 <xubing.bxb@alibaba-inc.com>
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.
Types
Background or solution
同时调整了 3 个编辑器的 margin 区域的边距，使其容纳得下图标
Changelog
渲染 3-way 视图下的 conflict actions 操作