Use \n in vignette, not \r\n

[MichaelChirico]

Somewhat annoyed that GitHub didn't flag this the first time around, I suspect the parent company is to blame 🙃

My local git copy really doesn't like there being a CRLF file around.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.77%. Comparing base (32e5aea) to head (b765957).
Report is 1 commits behind head on master.

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #7184   +/-   ##
=======================================
  Coverage   98.77%   98.77%           
=======================================
  Files          81       81           
  Lines       15203    15203           
=======================================
  Hits        15017    15017           
  Misses        186      186           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[ChristianWia]

I dont know from where is this problem. Reports just said that my branch was no longer aligned with the master and requested to solve the conflicts. Web interface just proposed the complete file selected in the modification - which I founded rather strange, but must go through to complete the step. Any idea ?

[MichaelChirico]

@ChristianWia I think your IDE/editor is using CRLF (\r\n) line endings, please change the setting so that it uses LF only (\n), if you search it should be easy to find.

From within R, you can do f <- 'vignettes/...'; writeLines(readLines(f), f) to overwrite all the existing files with \r.

[ChristianWia]

@ChristianWia I think your IDE/editor is using CRLF (\r\n) line endings, please change the setting so that it uses LF only (\n), if you search it should be easy to find.

From within R, you can do f <- 'vignettes/...'; writeLines(readLines(f), f) to overwrite all the existing files with \r.

As for the file corrections, I just used the web site editor proposed online by github in a standard way to solve the merge conflict (the pen icon). I have had no control on the EOL chars definition . Really strange. ....

[MichaelChirico]

Here's my understanding:

• In add french version of datatable-joins.Rmd #7151, the vignette was submitted with CRLF endings. This was unnoticed because it was only git add a new file.
  • master has CRLF
• You created change quote to Note in vignettes datatable-joins.Rmd #7179 branching from master
  • You inherit CRLF from master
• This PR changed the vignette to use LF
  • master has LF
• Now there is a conflict between your branch (CRLF) and master (LF).

GitHub "simple" editor is not well-suited for an end-of-line character resolution, so it's become awkward. Options I see are (1) make the edits locally instead (2) use the in-browser VScode editor https://docs.github.com/en/codespaces/the-githubdev-web-based-editor

[ChristianWia]

so the worm was in the apple. Will try githubdev editor on next updates. very clear explaination, i like! thanks.