Skip to content

Instantly share code, notes, and snippets.

@alexandreelise

alexandreelise/regex-to-find-merge-conflicts-in-git-when-using-phpstorm.txt

Created December 13, 2024 10:37
Show Gist options
  • Save alexandreelise/3082f69735e27d519a3c434cfd60bd1b to your computer and use it in GitHub Desktop.
Save alexandreelise/3082f69735e27d519a3c434cfd60bd1b to your computer and use it in GitHub Desktop.
Download ZIP
Find merge conflicts in git using PhpStorm Java based POSIX-form regex
Raw
regex-to-find-merge-conflicts-in-git-when-using-phpstorm.txt
(<<<<<<< ([A-Za-z\s]+)\n)([\p{Print}\p{Space}\p{ASCII}\p{L}]+)\n(=======)\n([\p{Print}\p{Space}\p{ASCII}\p{L}]+)(>>>>>>> ([A-Za-z\s]+))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment