flutter · fluttergithubbot · Apr 2, 2026 · Apr 2, 2026 · Apr 13, 2026 · Apr 13, 2026
diff --git a/packages/go_router/CHANGELOG.md b/packages/go_router/CHANGELOG.md
@@ -1,3 +1,10 @@
+<<<<<<< go_router-24678095354-1
+## 17.2.2
+
+- Fixes `pop()` restoring stale configuration when route has `onExit`, which could cause the popped route to reappear with async redirects.
+
+=======
+>>>>>>> release-go_router
-<<<<<<< go_router-24678095354-1
-## 17.2.2
-
- Fixes `pop()` restoring stale configuration when route has `onExit`, which could cause the popped route to reappear with async redirects.
-
-=======
->>>>>>> release-go_router
+## 17.2.2
+
+- Fixes pop() restoring stale configuration when route has onExit, which could cause the popped route to reappear with async redirects.
+
+
-<<<<<<< go_router-24678095354-1
-## 17.2.2
-
- Fixes `pop()` restoring stale configuration when route has `onExit`, which could cause the popped route to reappear with async redirects.
-
-=======
->>>>>>> release-go_router
+## 17.2.2
+
+- Fixes pop() restoring stale configuration when route has onExit, which could cause the popped route to reappear with async redirects.
+
+
 ## 17.2.1
 
 - Fixes chained top-level redirects not being fully resolved (e.g. `/ → /a → /b` stopping at `/a`).

diff --git a/packages/go_router/pending_changelogs/11241_fix_pop_restore.yaml b/packages/go_router/pending_changelogs/11241_fix_pop_restore.yaml
diff --git a/packages/go_router/pubspec.yaml b/packages/go_router/pubspec.yaml
@@ -1,7 +1,7 @@
 name: go_router
 description: A declarative router for Flutter based on Navigation 2 supporting
   deep linking, data-driven routes and more
-version: 17.2.1
+version: 17.2.2
 repository: https://github.com/flutter/packages/tree/main/packages/go_router
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router%22