I need a view on the webpage that can resolve conflicts #4508
Unanswered
Xiangzi529
asked this question in
Q&A
Replies: 1 comment
-
I thought this was a three way merge before, but after checking the document, it seems to be called a merge editor. How to use this merge editor and where can I introduce it |
Beta Was this translation helpful? Give feedback.
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
I need a view on the webpage that can resolve conflicts, which is the merge function. I don't know if it's a three-way merge component. I didn't find the corresponding method in the document to merge conflicts. The desired effect is shown in the following picture. Can this effect be achieved?
![ce9411dc5750d3baae4dd54b57f4af1](https://private-user-images.githubusercontent.com/165776161/330348197-19d8a0bc-9f2d-41db-af65-45b6ca680750.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTk2NDI4MTEsIm5iZiI6MTcxOTY0MjUxMSwicGF0aCI6Ii8xNjU3NzYxNjEvMzMwMzQ4MTk3LTE5ZDhhMGJjLTlmMmQtNDFkYi1hZjY1LTQ1YjZjYTY4MDc1MC5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQwNjI5JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MDYyOVQwNjI4MzFaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT1hMmYyZTBkNzE5MjQ3NWNkZWFmOTVlYzMxZjUzNTE5Mjg3ZGQ1YzhmM2FjM2JmMmM2OGU5MDU2NGY4Y2YzM2M0JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZhY3Rvcl9pZD0wJmtleV9pZD0wJnJlcG9faWQ9MCJ9.EuOwgx5Hvo0mwD07QyL99HlFBXgMkfkEwn_UB4NczFM)
![e9811f84f28fe73753962c177362727](https://private-user-images.githubusercontent.com/165776161/330348228-292f4f3f-903b-442f-91e9-21743a9004fd.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTk2NDI4MTEsIm5iZiI6MTcxOTY0MjUxMSwicGF0aCI6Ii8xNjU3NzYxNjEvMzMwMzQ4MjI4LTI5MmY0ZjNmLTkwM2ItNDQyZi05MWU5LTIxNzQzYTkwMDRmZC5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQwNjI5JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MDYyOVQwNjI4MzFaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0wMjI1YWMwZGRjNmFhOTg3Zjk3NzYwMzU4MmE3NGYzODUyOTY4MmNiNTg5NGNjODQ5YzRmN2IyN2RmMWY3NGQyJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZhY3Rvcl9pZD0wJmtleV9pZD0wJnJlcG9faWQ9MCJ9.eM7HdO4qPtnQt6zPdoH-rBTK44jkQnCC79L2TGrPG5o)
Beta Was this translation helpful? Give feedback.
All reactions