docs: explain [noeol] conflict marker comment

[scott2000]

The meaning of [noeol] might not be immediately clear to a user, so it would be good to document it on our documentation page for conflicts. We may also want to improve the conflict marker comments we use for this case in the future (possibly after receiving user feedback).

Follow up to #5186.

Checklist

If applicable:

• I have updated CHANGELOG.md
• I have updated the documentation (README.md, docs/, demos/)
• I have updated the config schema (cli/src/config-schema.json)
• I have added tests to cover my changes

[ilyagr]

This LGTM.

Thank you also for continuing to work on this. I'm sorry I haven't paid as much attention to this as I would have liked.

Please also give this a bit of time before merging, in case Yuya, Waleed, or others have comments.

[arxanas]

Docs look good to me overall, thanks for adding this.

[no action required] Looking at the docs now, I think the square brackets and abbreviated "keyword'-ish name make me think that the conflict marker has semantic meaning. If it had just written (no trailing newline) like normal prose then I would have assumed that it was primarily for my benefit as a reader, rather than machine-meaningful content.

[scott2000]

[no action required] Looking at the docs now, I think the square brackets and abbreviated "keyword'-ish name make me think that the conflict marker has semantic meaning. If it had just written (no trailing newline) like normal prose then I would have assumed that it was primarily for my benefit as a reader, rather than machine-meaningful content.

That's a good point. I think I'll merge this PR, and then make a separate PR that makes the wording a bit more clear as you suggested.