Line ending normalization has occurred - PRs may have merge conflicts #16761
Replies: 2 comments 8 replies
-
|
Hi @seanbudd I have merged to the commit just before the normalization to isolate future merges from this one: When I do: and then: And then when I do: I logically get the following message: I can probably ignore the changes in Thanks Cheers, Cyrille |
Beta Was this translation helpful? Give feedback.
-
|
@nvdaes thank you for replying. I wonder, have you faced some specific issues not described here? E.g. having more files than needed to merge. I can see in #16728 that you have merged commit 9ea2566 on June 27, 2024. Thus it seems that you have used the steps provided by @seanbudd before @seanbudd has edited the steps as described in #16761 (reply in thread). Is it correct? If yes, @seanbudd it's not clear to me what should be done, since I have had issues both with the steps befor you modified them and after... For now, for the branch of PR #16825, I have just manually reported the changes in a new branch. But having a clean merge process would be better since I have other pending branches / PRs, and I am not the only one. |
Beta Was this translation helpful? Give feedback.
-
|
@CyrilleB79 , I followed the steps provided by Sean before he edited them, i.e., the steps of the first comment by Sean. Then I merged origin/master as approrpriate. You may want to see the log of diffs made in PR #16728 |
Beta Was this translation helpful? Give feedback.
-
|
@CyrilleB79, FWIW, I managed to merge my PR in WSL. For more info see my comment in #16591. |
Beta Was this translation helpful? Give feedback.
-
|
@nvdaes what is your CrLf config? What does it return? |
Beta Was this translation helpful? Give feedback.
-
|
@CyrilleB79 , it returns true. Ichanged this parameter recently, after line ending normalization in NVDA when working in #16728 |
Beta Was this translation helpful? Give feedback.
-
|
@CyrilleB79, I successfully used a slight variant of @seanbudd's revised steps, to update PR #16369.
My variant, was that I tagged the commits he referenced, as "prenormal" and "normalize", to make doing this again easier.
"git config core.autocrlf" returns nothing.
The only problem I seem to have right now, is that I have an untracked file showing up in status, of "include/microsoft-ui-uiautomation/".
That seems harmless for this PR, so I haven't fixed it.
|
Beta Was this translation helpful? Give feedback.
-
We have just normalized the line endings for the entire repository to LF: #12387
This may cause merge conflicts with existing PRs.
Please handle conflicts as follows:
Files can be checked out locally using CRLF if needed for Windows development using git.
Beta Was this translation helpful? Give feedback.
All reactions