chore: bump to 0.2.3, update CHANGELOG

Author: the0807

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.2.3 (2026-04-19)
+
+### New Features
+- **Checkout keep-changes uses 3-way merge**: "Keep changes and checkout" option now runs `git checkout --merge` so dirty working tree is carried across branch switches via 3-way merge instead of being refused by git
+
+### Improvements
+- **Checkout dirty options simplified**: 4 radio options reduced to 3 — "Keep changes and checkout" (merge), "Stash and checkout" (always `-u`), "Discard all changes". Removed the separate tracked-only stash variant to reduce decision fatigue
+- **SCM sidebar polish**: Branches view opens expanded by default; pull/push title actions added next to fetch using webview-matching arrow icons; all 5 views (branches, remotes, tags, stashes, worktrees) now declare icons so they render correctly when moved between containers
+
+### Bug Fixes
+- **Side-by-side diff syntax highlighting**: Both panes now run through Shiki highlighting (previously only inline mode was highlighted — side-by-side rendered raw text)
+- **Hunk headers removed**: Raw unified-diff headers (`@@ -0,0 +1,37 @@`) removed from diff view; replaced with a thin dashed separator between hunks. Line number columns provide position without the visual noise
+
+### Tests
+- Added `checkout` option tests covering `--merge`, `--force`, and default invocations (97 tests total)
+
 ## 0.2.2 (2026-04-19)
 
 ### Security

package.json

@@ -2,7 +2,7 @@
   "name": "git-graph-plus",
   "displayName": "Git Graph Plus",
   "description": "A modern, full-featured Git GUI for VS Code",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "publisher": "the0807",
   "repository": {
     "type": "git",
@@ -54,12 +54,12 @@
       {
         "command": "gitGraphPlus.pull",
         "title": "%command.pull%",
-        "icon": "$(repo-pull)"
+        "icon": "$(arrow-down)"
       },
       {
         "command": "gitGraphPlus.push",
         "title": "%command.push%",
-        "icon": "$(repo-push)"
+        "icon": "$(arrow-up)"
       },
       {
         "command": "gitGraphPlus.checkoutBranch",
@@ -166,23 +166,29 @@
       "scm": [
         {
           "id": "gitGraphPlus.branches",
-          "name": "Branches"
+          "name": "Branches",
+          "icon": "$(git-branch)",
+          "visibility": "visible"
         },
         {
           "id": "gitGraphPlus.remotes",
-          "name": "Remotes"
+          "name": "Remotes",
+          "icon": "$(cloud)"
         },
         {
           "id": "gitGraphPlus.tags",
-          "name": "Tags"
+          "name": "Tags",
+          "icon": "$(tag)"
         },
         {
           "id": "gitGraphPlus.stashes",
-          "name": "Stashes"
+          "name": "Stashes",
+          "icon": "$(archive)"
         },
         {
           "id": "gitGraphPlus.worktrees",
-          "name": "Worktrees"
+          "name": "Worktrees",
+          "icon": "$(worktree)"
         }
       ]
     },
@@ -217,10 +223,20 @@
           "group": "navigation@3"
         },
         {
-          "command": "gitGraphPlus.createBranch",
+          "command": "gitGraphPlus.pull",
           "when": "view == gitGraphPlus.branches",
           "group": "navigation@4"
         },
+        {
+          "command": "gitGraphPlus.push",
+          "when": "view == gitGraphPlus.branches",
+          "group": "navigation@5"
+        },
+        {
+          "command": "gitGraphPlus.createBranch",
+          "when": "view == gitGraphPlus.branches",
+          "group": "navigation@6"
+        },
         {
           "command": "gitGraphPlus.createTag",
           "when": "view == gitGraphPlus.tags",