← 输入框|github.com|刷新
Skip to content

Resolve merge conflict in PR #1688 - #1795

Closed
phkahler with Copilot wants to merge 2 commits into
masterfrom
copilot/resolve-merge-conflict
Closed

phkahler with Copilot wants to merge 2 commits into
masterfrom
copilot/resolve-merge-conflict

Conversation

Copilot AI commented Oct 21, 2026

Copy link
Copy Markdown
Contributor

PR #1688’s non-recursive regeneration changes conflicted with newer pruning logic on master. This merge reconciles the generation flow while preserving the updated tag-reset behavior.

  • Conflict resolution: Integrate the non-recursive pruning and group-order regeneration changes in src/generate.cpp.
  • Compatibility: Clear request and constraint tags before pruning, and use const-correct sorting in RegenerateGroupOrder.

iscgar and others added 2 commits March 15, 2026 11:47
This results in a reduction of up to 50% in regeneration duration since
it only prunes sequentially. Pruning should be further optimised so that
it avoid traversing the full request and constraint list for every group
again.
…rge-conflict

# Conflicts:
#	src/generate.cpp

Co-authored-by: phkahler <14852918+phkahler@users.noreply.github.com>
@phkahler

Copy link
Copy Markdown
Member

This request indicated it was being handled by GPT6 Astra. It seems to be absolute garbage.

@phkahler

Copy link
Copy Markdown
Member

I guess it's not as bad as I thought. The tests are failing on the regression test:

NG test core/prune/failed_solve_keeps_constraints

for PR #1744 which is why the original PR here had conflicts.

@phkahler

Copy link
Copy Markdown
Member

Replaced by #1798

@phkahler phkahler closed this Oct 27, 2026
@phkahler
phkahler deleted the copilot/resolve-merge-conflict branch October 31, 2026 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants