sneak/sfdupes
1
0 Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Make next merge cleanly into main again #194

New Issue
Closed
opened 2026-11-11 10:07:38 +01:00 by clawbot · 2 comments
clawbot commented 2026-11-11 10:07:38 +01:00
Collaborator
Copy link
Copy source

next no longer merges cleanly into main (#185 reports not mergeable), after sneak's merge of next into main and the many merges into next since.

Definition of done

  • A PR into next that merges origin/main into next and resolves every conflict in favour of next's content, so that #185 reports mergeable again. No other change.
  • make check passes on the result.

Model: opus-5-5

`next` no longer merges cleanly into `main` (https://git.eeqj.de/sneak/sfdupes/pulls/185 reports not mergeable), after sneak's merge of `next` into `main` and the many merges into `next` since. ## Definition of done - A PR into `next` that merges `origin/main` into `next` and resolves every conflict in favour of `next`'s content, so that https://git.eeqj.de/sneak/sfdupes/pulls/185 reports mergeable again. No other change. - `make check` passes on the result. Model: opus-5-5
clawbot commented 2026-11-11 10:08:23 +01:00
Author
Collaborator
Copy link
Copy source

No PR opened: nothing to resolve. next already merges into main without conflicts, and #185 reports mergeable (checked 2026-11-11 09:08 UTC, next at 317abb8, main at 8ab5fd6).

  • main's only commit not in next is the merge of next into main, and its tree is identical to that next commit (202f083), the merge base. Merging main into next changes no file.
  • The "not mergeable" status was most likely stale: this issue was filed seconds after the merges into next, before Gitea rechecked.
  • A PR of a no-change merge commit would also vanish if squash-merged.

Recommendation: close this issue. If a merge commit recording main as an ancestor of next is still wanted, say so here and it must be merged with a merge commit, not squashed.

Model: opus-5-5

No PR opened: nothing to resolve. `next` already merges into `main` without conflicts, and https://git.eeqj.de/sneak/sfdupes/pulls/185 reports mergeable (checked 2026-11-11 09:08 UTC, `next` at `317abb8`, `main` at `8ab5fd6`). - `main`'s only commit not in `next` is the merge of `next` into `main`, and its tree is identical to that `next` commit (`202f083`), the merge base. Merging `main` into `next` changes no file. - The "not mergeable" status was most likely stale: this issue was filed seconds after the merges into `next`, before Gitea rechecked. - A PR of a no-change merge commit would also vanish if squash-merged. Recommendation: close this issue. If a merge commit recording `main` as an ancestor of `next` is still wanted, say so here and it must be merged with a merge commit, not squashed. Model: opus-5-5
clawbot commented 2026-11-11 14:10:56 +01:00
Author
Collaborator
Copy link
Copy source

Done: #185 merges cleanly into main again.

Model: opus-5-5

Done: https://git.eeqj.de/sneak/sfdupes/pulls/185 merges cleanly into `main` again. Model: opus-5-5
Sign in to join this conversation.
No Branch/Tag Specified
Labels
Clear labels
critical
Extremely important: data loss, a security hole, production down, or basic use impossible
 merge-ready
Review passed; ready to merge
 needs-checks
CI checks failing or not yet green
 needs-decision
needs-decision
Waits on a decision only sneak can make
 needs-decision
Waits on a decision before work continues
 needs-rebase
Branch conflicts with main; rebase required
 needs-review
PR awaiting independent adversarial review
 needs-rework
Review found blocking problems; author must rework
 post-1.0
postponed by sneak until after 1.0
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
clawbot sneak (Jeffrey Paul)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: sneak/sfdupes#194