Merge main into Settings destination
This commit is contained in:
@@ -117,3 +117,25 @@ Not in that list, and failing on `main` too: `settings_registration_test.dart`
|
||||
first-run walkthrough seen, so the walkthrough absorbs the bar tap; with that
|
||||
fixed locally it then fails with a null `ping` request. Identical failure on a
|
||||
clean `main` worktree, so it is pre-existing and was not changed here.
|
||||
|
||||
## Land re-entry 2: main moved again
|
||||
|
||||
The land gate reported `main` moved again and the branch no longer merged
|
||||
cleanly in `app/lib/shell/destination.dart` and
|
||||
`app/test/application/tab_location_navigation_test.dart`. `main` is now
|
||||
`89d869e2`. The merge is taken with `git merge --no-commit --no-ff main`, the
|
||||
two conflicted files are resolved and staged, and nothing is committed; the
|
||||
merge is pending (`MERGE_HEAD`) for the land stage to finish.
|
||||
|
||||
Conflicts resolved:
|
||||
- `app/lib/shell/destination.dart`: this branch's doc comment (Settings is its
|
||||
own destination, selected alone). Main's comment still described Settings as
|
||||
a page of the Pipelines tab.
|
||||
- `app/test/application/tab_location_navigation_test.dart`: this branch's tests
|
||||
(Settings state across Runs, re-selecting Pipelines, /settings selection,
|
||||
Settings-to-Pipelines restore). Main's version of the same hunk is a subset of
|
||||
these. Main's other edits (the `bar_action` import removal and Back changes)
|
||||
are kept.
|
||||
|
||||
Focused results (memwatch, one quoted list of 7 paths): 53 passed, 0 failed.
|
||||
Analyzer: clean.
|
||||
|
||||
Reference in New Issue
Block a user