Regex Delete Lines with delimiter `<<<<<<< HEAD` and `=======` in Reverted Commit in Git in Notepad++
Using a bad regex I accidentally deleted many lines I shouldn't have. After reverting the changes (a feature of Git Version Control), I have markdown files that look like this now:
<<<<<<< HEAD
There was a sentence here:
There was a third line here.
=======
There was a sentence here:
There was a second line here.
There was a third line here.
There were any number of lines here.
>>>>>>> parent of <commit ID> (<commit msg>)
My request is to use <<<<<<< HEAD and ======= as delimiters and delete all what's between the delimiters, including the delimiters as well. I would delete the >>>>>>> parent of <commit ID> (<commit msg>) bits separately afterwards.
My regex (.*) to match multiple lines between the delimiters was unsuccessful. I am using [{[(*"'!->1-9a-zA-ZÀ-ŰØ-űø-ÿ]+ instead of simple w+ to cater for any line-opening character/word I might want to be using. I have soft line breaks (two spaces) after each sentence, if that is important to you. (If you can match all what's between the delimiters, it might not even matter.)
Expected result:
There was a sentence here:
There was a second line here.
There was a third line here.
There were any number of lines here.
>>>>>>> parent of <commit ID> (<commit msg>)
As I said, I would deal with >>>>>>> parent of <commit ID> (<commit msg>) afterwards.
Also, it goes without saying that it is not always two lines between delimiters. Varying number of lines causes my issue.
Instead of using a non greedy match, you can use a negative lookahead matching lines in between that do not consist only of ======= which is more perfomant:
^<<<<<<< HEAD(?:\R(?!=======$).*)*+\R=======$
Explanation
^Start of string<<<<<<< HEADMatch literally(?:Non capture group\RMatch any unicode newline(?!=======$)Negative lookahead, assert that the line is not=======.*Match the whole line
)*+Close the non capture group and optionally repeat it using a possessive quantifier\RMatch any unicode newline=======Match literally$End of string
- How to combine all the words of a sentence extracted with a regex?
- How can I detect all symbols on mathematical operators on PHP using regex?
- RegEx for combining "match everything" and "negative lookahead"
- How to validate an Instagram username
- Parse video id and start time from differently formatted youtube URL strings
- Python - regex to grab specific lines from text
- how to escape texts for formatting in python
- Regex not correctly rejecting invalid music note values
- regex - error with result - too many occurence
- Parse a formatted, single-line string into an array of associative arrays with predefined column names
- How to split a string by any of multiple delimiters?
- std::regex escape special characters for use in regex
- Does lookbehind work in sed?
- Regex for complex delimited string with multiple parse patterns
- Parsing PDF tables into csv with php
- RegEx for "does not begin with"
- PHP regex starting and ending with < and > produces an unknown modifier warning
- Sanitize number by removing first digit then any consecutive zeros
- How to match one or more characters nominated in a regex character class?
- Sanitize a number which may include dollar symbols, hyphens and dots
- Validate a numeric filename which may only be between 01 and 12, then the file extension
- Regex for number check below a value (12)
- Validate a string containing a number, underscore, then an number with a maximum of 12 digits
- Regular expression that allows only a specific special character when it has a specific length
- java - regex pattern matching days, hours, minutes, seconds
- Regex pattern for matching words between two delimiters
- Matching a String in Python using regex
- How to match and extract string matching regular expression
- Problem subsetting a string from a filename
- Remove all non-alphanumeric characters but keep float values