merge_tools: create builtin merge editor #2118
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
ilyagr
reviewed
Aug 19, 2023
arxanas
force-pushed
the
arxanas/difftool-3
branch
2 times, most recently
from
befefab to
e932658
Compare
arxanas
force-pushed
the
arxanas/difftool-2
branch
from
144b08d to
a06f030
Compare
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
e932658 to
18b3d7a
Compare
arxanas
force-pushed
the
arxanas/difftool-2
branch
from
a06f030 to
715b590
Compare
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
18b3d7a to
b522168
Compare
arxanas
force-pushed
the
arxanas/difftool-2
branch
from
715b590 to
a375859
Compare
arxanas
changed the title
arxanas
force-pushed
the
arxanas/difftool-2
branch
from
a375859 to
ee77c67
Compare
arxanas
force-pushed
the
arxanas/difftool-3
branch
2 times, most recently
from
d69c2f1 to
875c24f
Compare
arxanas
changed the title
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
875c24f to
f5426d2
Compare
arxanas
force-pushed
the
arxanas/difftool-2
branch
from
3e26b49 to
82f2e6b
Compare
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
f5426d2 to
c2dde80
Compare
arxanas
force-pushed
the
arxanas/difftool-2
branch
from
82f2e6b to
5dd2cfa
Compare
|
@arxanas, let me know which of your PRs are ready for review. This one seems to be at the bottom of the stack, but GitHub says it has changes conflicting with |
|
@martinvonz The PRs marked as ready for review are ready. The conflict warning in GitHub can be misleading — this stack actually rebases without introducing any conflicts. |
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
c2dde80 to
b604a2d
Compare
martinvonz
reviewed
Sep 1, 2023
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
b604a2d to
7446c53
Compare
martinvonz
approved these changes
Sep 17, 2023
arxanas
force-pushed
the
arxanas/difftool-3
branch
from
7446c53 to
113e4fe
Compare
|
I have no idea why, but I had to force a rescan of the CLA using an internal web page. |
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.
Checklist
If applicable:
CHANGELOG.md