git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Question about git merge -s ort command‏‏

From
AMAriel Man <arielman22@gmail.com>
Date
Sep 19, 2021, 21:39 UTC
Message-ID
<CANgfOPtz9JqCs-7z1DJnOqxnsGiQS6BBPD6tKTWnTpC0K3qZ9Q@mail.gmail.com>

Hi, following the below thread, led me to do some tests: https://stackoverflow.com/a/69114710/11705021

One of the test can be seen here, in the last example in my question: https://stackoverflow.com/questions/69150777/git-mv-doesnt-work-as-expected-wrong-files-location

I wanted to get confirmation for my case: Does `git merge -s ort` command, doesn't know to detect new folder location when merging it? It did worked for folders and files renaming, and new files under existing folders (as describe here: https://stackoverflow.com/a/52227201/6309)

Ariel
Next: Elijah Newren
Message 1 of 4 in “Question about git merge -s ort command‏‏”
  1. Ariel ManSep 19, 2021
  2. Elijah NewrenSep 30, 2021
  3. Ariel ManSep 30, 2021
  4. Elijah NewrenOct 1, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.