diff --git a/.claude/settings.local.json b/.claude/settings.local.json new file mode 100644 index 0000000..c2a7791 --- /dev/null +++ b/.claude/settings.local.json @@ -0,0 +1,7 @@ +{ + "permissions": { + "allow": [ + "Bash(node scripts/validate.mjs)" + ] + } +} diff --git a/CHANGELOG.md b/CHANGELOG.md index 789f071..608efc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [1.2.0] - 2026-05-15 + +### Added + +- Added a dismissible "Start here" callout under the page intro on `index.html` and `branch-map.html`, with the dismissed state stored in `localStorage` under `git-map-start-here-dismissed`. +- Added an `id="daily-path"` anchor on the Beginner Daily Path block so the overview callout can jump to it. +- Added `git fetch` to the diverged scenario `next` steps so the standalone `git merge origin/` recommendation is paired with the preceding fetch. + +### Changed + +- Softened `git reset --soft HEAD~1` from `danger` to `caution` because the command keeps your edits staged; the note now also reminds users to avoid it on shared commits. +- Updated the diverged scenario summary to describe the fetch-then-merge option alongside rebase and merge. +- Moved the start-here setup into `src/version.js` so both HTML pages share the same callout behaviour without duplicating code. + ## [1.1.0] - 2026-05-15 ### Added diff --git a/README.md b/README.md index 66bc547..d539305 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [🌐 Live Demo](https://ikelaiah.github.io/git-map/) [GitHub Repository](https://github.com/ikelaiah/git-map) -[![Version](https://img.shields.io/badge/Version-1.1.0-2f6fed?style=for-the-badge)](CHANGELOG.md) +[![Version](https://img.shields.io/badge/Version-1.2.0-2f6fed?style=for-the-badge)](CHANGELOG.md) [![HTML5](https://img.shields.io/badge/Made%20with-HTML5-e34f26?style=for-the-badge&logo=html5&logoColor=white)](index.html) [![CSS](https://img.shields.io/badge/CSS-theme--tokens-2f6fed?style=for-the-badge&logo=css&logoColor=white)](src/styles.css) [![Vanilla JavaScript](https://img.shields.io/badge/Vanilla-JavaScript-f7df1e?style=for-the-badge&logo=javascript&logoColor=111111)](src/app.js) @@ -26,7 +26,9 @@ Git Map is a dependency-free Git visualisation and situation solver for beginner - 🗂️ Local Repo - 🌐 Remote Repo -Version 1.1 updates the command guidance for current Git behavior. The Git Branch Map now creates branches from any selected commit, generated histories include the realistic edit, stage, and commit flow, diverged pull guidance shows explicit fast-forward, rebase, and merge choices, and both HTML pages link back to the GitHub repository. +Version 1.2 sharpens onboarding and refines the risk and recovery guidance. A dismissible "Start here" callout points beginners at the Beginner Daily Path on the overview page and at the create-from-commit flow on the Git Branch Map. The diverged pull scenario now suggests `git fetch` followed by `git merge origin/` as a clear two-step pair, and `git reset --soft HEAD~1` is presented as a caution rather than a danger because it keeps your edits staged. + +Version 1.1 updated the command guidance for current Git behavior. The Git Branch Map creates branches from any selected commit, generated histories include the realistic edit, stage, and commit flow, diverged pull guidance shows explicit fast-forward, rebase, and merge choices, and both HTML pages link back to the GitHub repository. Commands in the app are examples. Replace placeholders such as ``, ``, ``, and visual IDs like `c2` with real paths, branch names, commit SHAs, tags, or refs from your repository. diff --git a/branch-map.html b/branch-map.html index d8d766b..4fccf6d 100644 --- a/branch-map.html +++ b/branch-map.html @@ -12,6 +12,11 @@

Git Branch Map

Create branches from commits, add commits, switch, and merge visually. Every action writes the Git commands that would produce the graph.

+