Git conflict experiment #5500
Draft
Git conflict experiment #5500
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
github-actions
bot
added
the
changes-stage0
github-actions
bot
temporarily deployed
to
lean-lang.org/lean4/doc
github-actions
bot
added
the
toolchain-available
leanprover-community-mathlib4-bot
added a commit
to leanprover-community/batteries
that referenced
this pull request
Sep 27, 2024
leanprover-community-mathlib4-bot
added a commit
to leanprover-community/mathlib4
that referenced
this pull request
Sep 27, 2024
leanprover-community-bot
added
the
builds-mathlib
|
Mathlib CI status (docs):
|
makes git conflict notation act as a comment needs stage0 update to get option to control incoming/current
kim-em
force-pushed
the
git_conflict_experiment
branch
from
e113623 to
cd53aa5
Compare
adomani
reviewed
Oct 2, 2024
| def parseStartDiff (errorMsg : String) : ParserFn := | ||
| let p := satisfyFn (· == '<') errorMsg | ||
| andthenFn (checkColZero errorMsg) | ||
| (andthenFn p (andthenFn p (andthenFn p (andthenFn p (andthenFn p (andthenFn p (andthenFn p |
There was a problem hiding this comment.
What do you think of starting the diff with 6, rather than 7, <?
This means that you can remove the first <, exclude all editor diff-related noise, and view a "clean" file?
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.
This is an experiment to have git conflict syntax be processed like comments.
The option
parser.git.useIncomingcontrols whether to use the incoming or current versions.@jcommelin @adomani