Repository navigation
Conflict panel: show which side is this browser, with date and size of each version - #36
Merged
Merged
Conversation
…f each version The panel listed only a project name and revision ids, which does not help to decide which version to keep. Show "This browser" / "Server / other device", the last modified date and the dialogue and node counts of each side, plus a one-line hint. Translated in all six locales. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01U2LYX8SVLgzrkJt4GiVG1P
✅ Deploy Preview for mountea-dialoguer ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
Up to standards ✅🟢 Issues
|
| Metric | Results |
|---|---|
| Complexity | 0 |
| Duplication | 2 |
NEW Get contextual insights on your PRs based on Codacy's metrics, along with PR and Jira context, without leaving GitHub. Enable AI reviewer
TIP This summary will be updated as you push new changes.
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.
The conflict panel listed only a project name and revision ids, which does not help to decide which version to keep (it confused its first real user after a migration).
Tests:
sync-regressions.spec.jsgains a test that builds a real conflict and checks the summary. The sync regression specs pass; ISS-017 inlocalization-regressionsfails on an untoucheddevas well.Re-checked locally on macOS against
devat29fb8c9:npm run linthas no errors, and all 23sync-regressionstests pass.🤖 Generated with Claude Code