From cba2d9bb1637db3f000ebe076287eae4e08ba07c Mon Sep 17 00:00:00 2001 From: Bjarke Sporring Date: Fri, 16 Jan 2026 12:15:11 +0100 Subject: [PATCH] chore: cleanup --- .../02_AZURE-DEVOPS-SSH-SETUP.md | 38 ++++++------------- 01-essentials/08-multiplayer/03_README.md | 32 ++++++++-------- 2 files changed, 28 insertions(+), 42 deletions(-) diff --git a/01-essentials/08-multiplayer/02_AZURE-DEVOPS-SSH-SETUP.md b/01-essentials/08-multiplayer/02_AZURE-DEVOPS-SSH-SETUP.md index 05457b0..8536909 100644 --- a/01-essentials/08-multiplayer/02_AZURE-DEVOPS-SSH-SETUP.md +++ b/01-essentials/08-multiplayer/02_AZURE-DEVOPS-SSH-SETUP.md @@ -20,7 +20,7 @@ SSH (Secure Shell) keys provide a secure way to authenticate with Azure DevOps w Before starting, ensure you have: - **Git 2.23 or higher** installed - ```powershell + ```pwsh git --version ``` @@ -28,7 +28,7 @@ Before starting, ensure you have: - If you don't ask your organisation for an invitation - **PowerShell 7+ or Bash terminal** for running commands - ```powershell + ```pwsh pwsh --version ``` @@ -42,7 +42,7 @@ SSH authentication uses a key pair: a private key (stays on your computer) and a Open your terminal and run: -```powershell +```pwsh ssh-keygen -t rsa ``` @@ -73,7 +73,7 @@ Enter same passphrase again: Check that your keys were created: **Windows PowerShell:** -```powershell +```pwsh dir $HOME\.ssh\ ``` @@ -108,27 +108,17 @@ Now you'll upload your public key to Azure DevOps. Open your terminal and display your public key: -**Linux/Mac:** -```bash -cat ~/.ssh/id_rsa.pub -``` - **Windows PowerShell:** -```powershell +```pwsh type $HOME\.ssh\id_rsa.pub ``` -**Windows Command Prompt:** -```cmd -type %USERPROFILE%\.ssh\id_rsa.pub -``` - The output will look like this: ``` ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC2YbXnrSK5TTflZSwUv9KUedvI4p3JJ4dHgwp/SeJGqMNWnOMDbzQQzYT7E39w9Q8ItrdWsK4vRLGY2B1rQ+BpS6nn4KhTanMXLTaUFDlg6I1Yn5S3cTTe8dMAoa14j3CZfoSoRRgK8E+ktNb0o0nBMuZJlLkgEtPIz28fwU1vcHoSK7jFp5KL0pjf37RYZeHkbpI7hdCG2qHtdrC35gzdirYPJOekErF5VFRrLZaIRSSsX0V4XzwY2k1hxM037o/h6qcTLWfi5ugbyrdscL8BmhdGNH4Giwqd1k3MwSyiswRuAuclYv27oKnFVBRT+n649px4g3Vqa8dh014wM2HDjMGENIkHx0hcV9BWdfBfTSCJengmosGW+wQfmaNUo4WpAbwZD73ALNsoLg5Yl1tB6ZZ5mHwLRY3LG2BbQZMZRCELUyvbh8ZsRksNN/2zcS44RIQdObV8/4hcLse30+NQ7GRaMnJeAMRz4Rpzbb02y3w0wNQFp/evj1nN4WTz6l8= your@email.com ``` -**Copy the entire output** (from `ssh-rsa` to your email address). +**Copy the entire output** (from `ssh-rsa` to and including your email address). ### Paste and Name Your Key @@ -152,12 +142,12 @@ Now that SSH is configured, you can use it for all Git operations. To clone a repository using SSH: -```bash +```pwsh git clone git@ssh.dev.azure.com:v3/{organization}/{project}/{repository} ``` **Example** (replace placeholders with your actual values): -```bash +```pwsh git clone git@ssh.dev.azure.com:v3/myorg/git-workshop/great-print-project ``` @@ -175,7 +165,7 @@ git clone git@ssh.dev.azure.com:v3/myorg/git-workshop/great-print-project All standard Git commands now work seamlessly with SSH: -```bash +```pwsh # Pull latest changes git pull @@ -195,7 +185,6 @@ git push -u origin feature-branch ## Additional Resources - **Azure DevOps SSH Documentation**: [https://docs.microsoft.com/en-us/azure/devops/repos/git/use-ssh-keys-to-authenticate](https://docs.microsoft.com/en-us/azure/devops/repos/git/use-ssh-keys-to-authenticate) -- **SSH Key Best Practices**: [https://security.stackexchange.com/questions/tagged/ssh-keys](https://security.stackexchange.com/questions/tagged/ssh-keys) - **Git with SSH**: [https://git-scm.com/book/en/v2/Git-on-the-Server-Generating-Your-SSH-Public-Key](https://git-scm.com/book/en/v2/Git-on-the-Server-Generating-Your-SSH-Public-Key) --- @@ -204,17 +193,14 @@ git push -u origin feature-branch ### Common Commands -```bash +```pwsh # Generate RSA key ssh-keygen -t -# Display public key (Linux/Mac) -cat ~/.ssh/id_rsa.pub - -# Display public key (Windows) +# Display public key type $HOME\.ssh\id_rsa.pub -# Clone with SSH +# Clone with SSH. You can find this url on Azure DevOps git clone git@ssh.dev.azure.com:v3/{org}/{project}/{repo} # Check remote URL diff --git a/01-essentials/08-multiplayer/03_README.md b/01-essentials/08-multiplayer/03_README.md index 8c1cd8e..29e0ec5 100644 --- a/01-essentials/08-multiplayer/03_README.md +++ b/01-essentials/08-multiplayer/03_README.md @@ -128,7 +128,8 @@ git pull # Now we resolve the merge. We're merging the main branch INTO the feature-2 branch. git merge main - # Resolve the merge conflict in numbers.txt + # Resolve the merge conflict in numbers.txt by opening in VSCode and choosing the changes you want. + # How you solve it is up to you. # Once resolved git add numbers.txt git commit @@ -142,30 +143,29 @@ git pull | Command | What It Does | |---------|--------------| -| `git switch -c ` | Create and switch to new branch | -| `git push -u origin ` | Push branch to Azure DevOps | -| `git switch main` | Switch to main branch | +| `git switch -c ` | Create and switch to new branch | +| `git switch ` | Switch to branch | +| `git push` | Push branch to Azure DevOps | | `git pull` | Get latest changes from remote | --- -## Common Issues +## Cheatsheet -### "My PR has conflicts" -1. Update your branch with latest main: - ```powershell - git switch main - git pull - git switch - git merge main - ``` -2. Resolve conflicts in VS Code -3. Commit and push again +### Solving merge conflicts +```pwsh +git switch main +git pull +git switch +git merge main +# ... Solve the conflicts +git push +``` ### "I need to make more changes to my PR" Just commit and push to the same branch - the PR updates automatically: -```powershell +```pwsh git add . git commit -m "fix: address review feedback" git push