rokucommunity / rokucommunity/brighterscript-formatter
Do not format merge conflict markers
Open
Nobody has claimed this yet.
bug
- Dominant language
- TypeScript
- Stars
- 17
- Forks
- 10
- Avg merge
- 49m
- Merged PRs (30d)
- 7
Description
<<<<<<< HEAD
var1 = 1
=======
var2 = 2
>>>>>>> main
formats into
<<<<<< < HEAD
var1 = 1
= = = = = = =
var2 = 2
>>>>>> > main
This is particularly annoying if you have format on save in vs code and try to modify things and save
Contributor guide
No contributing guide indexed for this repository
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
No file or test is named in the issue. Start by reproducing the formatter behavior with the provided merge-conflict snippet, then locate where conflict markers are processed. Done means formatting preserves the markers exactly while still formatting ordinary code around them.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- typescript
- Domain
- tooling
- Issue type
- Bug
- Difficulty
- 3/5
- Estimated time
- 1-2 days
- Activity status
- Quiet
- Clarity
- Mostly clear
- Newbie friendliness
- 55/100