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.

Sign up for GitHub

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

Jump to bottom

When the conflict position is the bottom line of the file #1626

Open

junxxzz opened this issue Mar 15, 2024 · 0 comments

junxxzz commented Mar 15, 2024 •

edited

and, If the last line does not end with Enter

svn-scm/src/commands/command.ts

Line 279 in 2d3fdc1

if (/^<{7}[^]+^={7}[^]+^>{7}/m.test(text)) {

This regular expression does not match

So you can't see the code lens action.

we need more detail regxp.

my suggest => /^<{7} .working[^]+={7} .merge[^]+>{7} .merge/m.test(text)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment