fix(loop): a conflict does not say which side is behind - #361
Merged
Merged
Conversation
… rebase" was advice toward deleting finished code `land` reported nine conflicts and one remedy: rebase, or close as superseded. Taking that advice on browseros-ai#1302 would have destroyed landed work. browseros-ai#1302 is "expose Queen billing mode and quota authority in public research status", 205 insertions, accepted, its issue already closed. Replaying it onto today's base would have: - deleted `WorkerCapacityBreakdown`, which is browseros-ai#1308's work, carried and merged as PR #331 after this branch was cut - deleted the tree-load-failure handling the base gained since - REINTRODUCED a non-ASCII ellipsis into a path redaction the base already performs in ASCII - breaking L3 in the same stroke That branch is not waiting for a rebase. It is superseded in part, and what survives is a small delta belonging on today's base as new work. A conflict says two sides touched the same lines; it says nothing about which side is behind, and the advice depends entirely on that. So the report measures it: how far has the base travelled on the conflicting files since the fork point? CONFL queen-1302 2 conflicting file(s): ...queen-public-research.ts, ...test.ts | the base moved on these since the fork: N commit(s), M insertions - a rebase would replay OLD code over new; re-file what survives against today's base It is a measurement, not a verdict. The person still decides, with the number that decides it. AND THE COUNT WAS INFLATED. `git merge-tree --name-only` interleaves prose with paths - "Auto-merging X" and "CONFLICT (add/add): Merge conflict in X" are commentary about the file named on the line above. Counting them reported "6 conflicting path(s)" for two files. An inflated number is how a report stops being read, and this one had been doubling every conflict it printed. The reason line is no longer truncated to 96 characters either, which had been cutting off exactly the half that says what to do. selftest 145 pass 0 fail.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fix(loop): a conflict does not say which side is behind, and "needs a rebase" was advice toward deleting finished code
landreported nine conflicts and one remedy: rebase, or close as superseded.Taking that advice on browseros-ai#1302 would have destroyed landed work.
browseros-ai#1302 is "expose Queen billing mode and quota authority in public research
status", 205 insertions, accepted, its issue already closed. Replaying it onto
today's base would have:
WorkerCapacityBreakdown, which is chore: bump version browseros-ai/BrowserOS#1308's work, carried and mergedas PR carry forward: the work on queen-1308 that conflicted with the base #331 after this branch was cut
performs in ASCII - breaking L3 in the same stroke
That branch is not waiting for a rebase. It is superseded in part, and what
survives is a small delta belonging on today's base as new work. A conflict says
two sides touched the same lines; it says nothing about which side is behind,
and the advice depends entirely on that.
So the report measures it: how far has the base travelled on the conflicting
files since the fork point?
CONFL queen-1302 2 conflicting file(s): ...queen-public-research.ts, ...test.ts
| the base moved on these since the fork: N commit(s), M insertions -
a rebase would replay OLD code over new; re-file what survives against
today's base
It is a measurement, not a verdict. The person still decides, with the number
that decides it.
AND THE COUNT WAS INFLATED.
git merge-tree --name-onlyinterleaves prose withpaths - "Auto-merging X" and "CONFLICT (add/add): Merge conflict in X" are
commentary about the file named on the line above. Counting them reported "6
conflicting path(s)" for two files. An inflated number is how a report stops
being read, and this one had been doubling every conflict it printed.
The reason line is no longer truncated to 96 characters either, which had been
cutting off exactly the half that says what to do.
selftest 145 pass 0 fail.