refactor-reset-revert #1

floppydiscen · 2026-01-15T16:31:55Z

floppydiscen commented

2026-01-15 16:31:55 +00:00

No description provided.

floppydiscen added 61 commits 2026-01-15 16:31:55 +00:00

feat: initial branching+merge+conflicts module merge a0a9a5a0d9

fix: remove accidental subproject addition 039debe744

feat: split out reset from the revert. First the safe path then the advanced path 8d63b2d22e

refactor: rename 01_essentials to 01-essentials 5f78245734

fix: cleanup README and focus on windows 5492f17a5a

feat: initial install-prerequisites script that install vscode, git and powershell 7 bb01592b6c

Add oneshot installation script for easy setup 34f2607b22

- Created install.ps1 that downloads repository and runs prerequisites installer
- Updated README.md and INSTALLATION.md to document the new oneshot option
- Script can be run with: irm https://git.frod.dk/floppydiscen/git-workshop/raw/branch/main/install.ps1 | iex
- Provides seamless installation experience for new users

Update oneshot installation to clone repository locally e7ce41cbbc

- Modified install.ps1 to clone git-workshop repository to ~/git-workshop
- Added option to remove existing directory before cloning
- Updated documentation to reflect the new behavior
- Now provides complete setup: install tools + clone repo in one command
- Similar to Scoop's get.scoop.sh installation pattern

Simplify README installation instructions f696044461

- Remove complex installation options
- List prerequisites with direct winget commands
- Keep oneshot installation as recommended option
- Add manual setup steps for clarity
- Focus on getting users started quickly

Add progress bars to install-prerequisites.ps1 6d2e099eb4

- Added overall progress tracking for required installations (1/3, 2/3, 3/3)
- Added progress indicators for optional installations
- Added individual package installation progress with status updates
- Progress bars show clear visual feedback during installation process
- Helps users understand how far along the installation is

Add VSCode extensions and PowerShell 7 integration setup f55cb444e7

- Added function to install VSCode extensions via command line
- Install PowerShell extension for better PowerShell support in VSCode
- Install GitLens and Git Graph extensions for enhanced Git experience
- Configure VSCode to use PowerShell 7 as default terminal
- Update progress tracking to include extension installation step
- Add extension results to installation summary

Remove GitLens and GitGraph extensions from VSCode setup 985c4a0a8a

- Keep only essential PowerShell extension and PowerShell 7 integration
- Simplify VSCode setup to focus on core requirements
- Reduce installation time and complexity
- Users can install additional Git extensions manually if desired

Add user confirmation for PowerShell 7 terminal integration 734b49bc7d

- Ask user before setting PowerShell 7 as default VSCode terminal
- Make PowerShell terminal setup recommended but optional
- Add separate tracking for terminal integration result
- Update installation summary to show configuration status
- Provide clearer feedback on what was configured

Fix Git version check to handle Windows formatting 14cfc2feeb

- Update Test-GitVersion to properly parse Git versions with Windows suffixes
- Handle formats like '2.52.0.windows.1' correctly
- Parse major and minor version numbers separately for accurate comparison
- Now correctly identifies versions 2.23+ regardless of Windows-specific suffixes
- Add better error message when version parsing fails

refactor: do not exit on script finish 7066e648d5

refactor: move install-prerequisites to install.ps1 cbefeaf4d2

Add repository cloning and VSCode opening to install.ps1 09f25d6eae

- Ask user if they want to clone workshop to Documents/git-workshop
- Automatically clone repository to Documents folder for convenience
- Open VSCode in the workshop directory after cloning
- Handle existing repositories (update if already cloned)
- Provide quick start commands for VSCode terminal
- Fallback to manual instructions if user declines or cloning fails
- Complete end-to-end setup experience

Remove Python installation and add one-shot install instructions 07faa14b7a

- Remove all Python-related installation logic since Module 08 is Git-only
- Update synopsis to mention repository cloning capability
- Add one-shot installation instructions using Invoke-RestMethod
- Remove Python from results tracking, installation prompts, and verification
- Simplify installation summary without Python references
- Update examples to show both one-shot and local execution methods

Fix version parsing in Install-Package for Windows Git format c28151cc19

- Update regex to extract only semantic version numbers (x.y.z)
- Prevents matching entire string like '2.52.0.windows.1'
- Uses '^(\d+(?:\.\d+){1,2})' to match version at start of string only
- Extracts '2.52.0' from '2.52.0.windows.1' for proper version comparison
- Handles Windows Git version suffixes correctly
- Maintains compatibility with standard version formats

Add clear terminal opening guidance for VSCode 2633ee2b71

- Enhance instructions for opening integrated terminal in VSCode
- Provide multiple methods: Ctrl+backtick, menu, and Command Palette
- Add visual separation with headers for important information
- Emphasize that terminal opening is REQUIRED for next steps
- Include detailed fallback instructions if VSCode command fails
- Make terminal guidance impossible to miss with multiple clear options
- Remove ambiguity about how to access terminal in VSCode

fix: version match c99e238814

fix: version regex for git and other semver stuff 91c46718c6

fix: let's just try to find a version inside the version string 32a0e89f72

fix: proper version formatting for install version check 009a3a9104

feat: add a "what do you want" step a392e8c97d

fix: remove the statement? daa787842a

fix: init of prereqs 9e22f84a53

fix: version checks eadf8cfe6a

refactor: simplify user choice. Install and clone split 7e2f8d64fb

feat: make the steps more explicit b2b8a2cfff

fix: verification of answers for history 9e03a9624a

feat: add azure devops ssh setup guidelines 8b3ba808d1

feat: add a simple best practices for when working together 25077cd589

feat: add commit message best practices 74a23dbbca

feat: add a WHAT-IS-GIT file that describes the essentials of what GIT is 5b4c544fee

feat: update README to include SSH guidelines 76c4182186

refactor: simplify the multiplayer part of Git ea5cbccc75

refactor: we're breaking out merge-conflicts 7b638d27de

refactor: check for main branch bf07cb1868

fix: naming of main branch write host ced65740a3

refactor: add better instructions for branching and merging c3d9d3337c

feat: set git defaultBranch to main 0183a06134

feat: setup merge and diff for git f0522e14bc

fix: add better explanation of merges 8a82253fc2

fix: add suggestion for a new file for branching and merging 40341d21a7

feat: check for mainbranch 9fbdd941fa

fix: remove subproject "challenge" folders 988ce3bc92

fix: cherry-pick conflict 1c20a06c21

refactor: move reset to advanced a34b7d155f

fix: cleanup cherry-picking tasks and tips 3130874981

refactor: move 08 down a step 939bd397f1

fix: revert conflict aa24c50b45

refactor: rewrite the merge-revert section 575e083f33

It is an advanced and difficult revert to accomplish and should probably
be done through a reset instead, which means that we're modifying
history which is dangerous and so should be handled by someone who
understands these dangers.

fix: remove revert-middle challenge 0474a6de0e

fix: cleanup revert module cdd695b250

fix: stash issues b0d2d43c8b

fix: stash challenge 2a5eb137f6

refactor: simplify the multiplayer part fcaf97f60b

feat: drastically simplify the multiplayer module bd69774191

refactor: remove advanced for now 356b6268ba

feat: drastically simplify tasks for multiplayer a895abdd03

floppydiscen merged commit 2240cbe10d into main

2026-01-15 16:32:20 +00:00

floppydiscen referenced this issue from a commit

2026-01-15 16:32:20 +00:00