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.
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement merging groups in the three way merge UI #8960
Implement merging groups in the three way merge UI #8960
Changes from all commits
376760c
d898da1
752954b
41b499f
a63045f
0901768
5874b4e
3c3fb02
81815fa
18d95c2
0e08af3
2bb0b6c
1b12b75
4c073d3
6359058
d45f4a1
7e226e2
fb137cb
8d76e40
98eea59
3187365
d00bab3
02c0404
05527c6
b6db346
fa97b59
52b5604
b2e5d38
51c6195
e66ae3d
d39171e
6cdcec7
c19d46a
d1983ba
5d22e16
23c6c91
d2f8e21
329e2f9
3df63ae
dd28f10
8231f75
3575569
7aa387f
4a8f1e8
70522eb
9a05277
d578b7e
27dbcd1
c9b87de
5e306a4
5c5c68a
d14cb0f
23be621
0fe1f1b
ae10410
d26a6bb
d89d558
9c5e623
9e97598
6bad428
9cc0d18
c37c3c1
39ee372
2ed0062
3ea5cd1
758c13d
d815bbe
d071fe4
735dc5a
ff58de9
7345482
d072bab
5187934
cc3560f
b56e5d0
d09808b
5c0b51f
0c0db6a
d854958
1fe1697
b09933a
2f39c4e
a8b2aed
aaf77ad
c96b122
f8abc0f
7af8944
4e2e2d2
30e817b
c8a9e31
815d415
89357c6
9973e03
ee64212
5af4864
ed2a0ac
bcec6a8
be0a7fb
0602237
41cae26
ddac224
6859ca4
6dcaaa1
5df2d50
db706a8
fffc5d1
b4827ec
a94acd4
484a368
dc02f37
6aac5fd
ce9735d
6e8e08f
d3aacae
194be4d
031e6f0
54f2ab3
d1a3ed9
c217cf8
0ea0da1
675669f
e9ab51d
d166273
2f4d6d3
9463db7
0992b22
05518ea
b38eeec
0d4a8c2
3469ffc
22eea64
8809bea
30b90bd
4217057
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
This file was deleted.