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

[GSoC] [RFC] stashing unmerged index entries

From
KJKapil Jain <jkapil.cs@gmail.com>
Date
Apr 9, 2019, 08:16 UTC
Message-ID
<CAMknYEMQ6K7j2M1CSv9uCF8aDQK6+PmTJi-XgFNy+McE9f7OsQ@mail.gmail.com>
Reference: https://git.github.io/SoC-2019-Ideas/#teach-git-stash-to-handle-unmerged-index-entries

"When the index is unmerged, git stash refuses to do anything. That is unnecessary, though, as it could easily craft e.g. an octopus merge of the various stages. A subsequent git stash apply can detect that octopus and re-generate the unmerged index."

according to it we take the unmerged entries (caused by conflicted merge) in index from all stages, and do an octopus merge. how does this solve the problem, i mean where do those entries go after octopus merge ? a conflicted merge is still there, do we store the merge separately ?

Next: Duy Nguyen
Message 1 of 2 in “[GSoC] [RFC] stashing unmerged index entries”
  1. Kapil JainApr 9, 2019
  2. Duy NguyenApr 9, 2019

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.