Repository navigation

Avoid conflicts and duplicate lines when moving a patch to an earlier commit - #6167

Open

stefanhaller wants to merge 8 commits into

improve-moving-hunk-to-earlier-commit

Open

Avoid conflicts and duplicate lines when moving a patch to an earlier commit#6167
stefanhaller wants to merge 8 commits into
masterfrom
improve-moving-hunk-to-earlier-commit

Commits on Nov 3, 2026
- Add tests demonstrating bugs when moving a patch to an earlier commit
  
  stefanhaller
  and
  claude
  committed
  7bf398d
- Add a test demonstrating that the conflicts popup disappears
  
  stefanhaller
  and
  claude
  committed
  9383172
- Disable moving a patch between a merge commit and another commit
  
  stefanhaller
  and
  claude
  committed
  e8261e0
- Add a function to change which commit a rebase todo picks
  
  stefanhaller
  and
  claude
  committed
  09068b0
- Avoid conflicts and duplicate lines when moving a patch to an earlier commit
  
  stefanhaller
  and
  claude
  committed
  507b650
- Avoid conflicts and duplicate lines when moving a patch into a new commit before
  
  stefanhaller
  and
  claude
  committed
  16f51df
- Unify the handlers for moving a patch into a new commit
  
  stefanhaller
  and
  claude
  committed
  3864ddc
- Keep the conflicts popup open after moving a patch into a new commit
  
  stefanhaller
  and
  claude
  committed
  fabc14d