Bjarke Sporring
c69b463f84
fix: proper check when verifying a merge
2026-01-21 11:39:30 +01:00
Bjarke Sporring
39d8ace75c
fix: consistent naming of files
2026-01-21 10:53:35 +01:00
Bjarke Sporring
4b9d2449c8
refactor: use the new utils.ps1 script for operations
2026-01-21 10:51:59 +01:00
Bjarke Sporring
5582b9fcbd
refactor: reorder intro files
2026-01-21 10:51:34 +01:00
Bjarke Sporring
3a6eb0646b
feat: add util.ps1 script for common operations
2026-01-21 10:51:07 +01:00
Bjarke Sporring
a898030a9f
fix: use git stash push instead of git stash save which is deprecated
2026-01-18 09:27:12 +01:00
Bjarke Sporring
382a125076
fix: add install instructions
2026-01-16 12:43:11 +01:00
Bjarke Sporring
d80fa74af9
refactor: move the installation description to the README.md
2026-01-16 12:40:49 +01:00
Bjarke Sporring
7fc0c1342a
refactor: cleanup root readme
2026-01-16 12:36:40 +01:00
Bjarke Sporring
cba2d9bb16
chore: cleanup
2026-01-16 12:15:11 +01:00
Bjarke Sporring
968a44f9a5
fix: cleanup some explanations
2026-01-16 12:11:03 +01:00
Bjarke Sporring
c39573573f
fix: remove mention of rebase
2026-01-16 11:13:11 +01:00
Bjarke Sporring
ee67433fdd
refactor: minor cleanup and expanding explanations for multiplayer
2026-01-16 11:12:53 +01:00
Bjarke Sporring
100e89b23d
refactor: update docs for the install.ps1 script
2026-01-16 10:26:02 +01:00
b58080b8e8
Merge pull request 'refactor-reset-revert' ( #3 ) from refactor-reset-revert into main
...
Reviewed-on: #3
2026-01-16 09:19:41 +00:00
Bjarke Sporring
6cf0418ebd
fix: remove references to git reset
2026-01-16 10:18:46 +01:00
Bjarke Sporring
a8e9507f89
fix: missing images for ssh setup
2026-01-15 18:30:52 +01:00
2240cbe10d
Merge pull request 'refactor-reset-revert' ( #1 ) from refactor-reset-revert into main
...
Reviewed-on: #1
2026-01-15 16:32:19 +00:00
Bjarke Sporring
a895abdd03
feat: drastically simplify tasks for multiplayer
2026-01-15 17:30:03 +01:00
Bjarke Sporring
356b6268ba
refactor: remove advanced for now
2026-01-15 17:27:35 +01:00
Bjarke Sporring
bd69774191
feat: drastically simplify the multiplayer module
2026-01-15 17:25:33 +01:00
Bjarke Sporring
fcaf97f60b
refactor: simplify the multiplayer part
2026-01-15 17:03:51 +01:00
Bjarke Sporring
2a5eb137f6
fix: stash challenge
2026-01-15 16:42:45 +01:00
Bjarke Sporring
b0d2d43c8b
fix: stash issues
2026-01-15 16:37:57 +01:00
Bjarke Sporring
cdd695b250
fix: cleanup revert module
2026-01-15 16:29:06 +01:00
Bjarke Sporring
0474a6de0e
fix: remove revert-middle challenge
2026-01-15 16:23:32 +01:00
Bjarke Sporring
575e083f33
refactor: rewrite the merge-revert section
...
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.
2026-01-15 16:11:24 +01:00
Bjarke Sporring
aa24c50b45
fix: revert conflict
2026-01-15 15:50:54 +01:00
Bjarke Sporring
939bd397f1
refactor: move 08 down a step
2026-01-15 15:42:05 +01:00
Bjarke Sporring
3130874981
fix: cleanup cherry-picking tasks and tips
2026-01-15 15:41:21 +01:00
Bjarke Sporring
a34b7d155f
refactor: move reset to advanced
2026-01-15 15:22:45 +01:00
Bjarke Sporring
1c20a06c21
fix: cherry-pick conflict
2026-01-15 15:20:32 +01:00
Bjarke Sporring
988ce3bc92
fix: remove subproject "challenge" folders
2026-01-15 14:31:30 +01:00
Bjarke Sporring
9fbdd941fa
feat: check for mainbranch
2026-01-15 14:31:00 +01:00
Bjarke Sporring
40341d21a7
fix: add suggestion for a new file for branching and merging
2026-01-15 14:30:08 +01:00
Bjarke Sporring
8a82253fc2
fix: add better explanation of merges
2026-01-15 14:22:11 +01:00
Bjarke Sporring
f0522e14bc
feat: setup merge and diff for git
2026-01-15 14:07:25 +01:00
Bjarke Sporring
0183a06134
feat: set git defaultBranch to main
2026-01-15 13:55:55 +01:00
Bjarke Sporring
c3d9d3337c
refactor: add better instructions for branching and merging
2026-01-15 13:47:30 +01:00
Bjarke Sporring
ced65740a3
fix: naming of main branch write host
2026-01-15 13:16:34 +01:00
Bjarke Sporring
bf07cb1868
refactor: check for main branch
2026-01-15 13:14:38 +01:00
Bjarke Sporring
7b638d27de
refactor: we're breaking out merge-conflicts
2026-01-15 12:51:43 +01:00
Bjarke Sporring
ea5cbccc75
refactor: simplify the multiplayer part of Git
2026-01-15 12:04:20 +01:00
Bjarke Sporring
76c4182186
feat: update README to include SSH guidelines
2026-01-15 12:03:50 +01:00
Bjarke Sporring
5b4c544fee
feat: add a WHAT-IS-GIT file that describes the essentials of what GIT is
2026-01-15 12:03:12 +01:00
Bjarke Sporring
74a23dbbca
feat: add commit message best practices
2026-01-15 12:02:25 +01:00
Bjarke Sporring
25077cd589
feat: add a simple best practices for when working together
2026-01-15 12:02:13 +01:00
Bjarke Sporring
8b3ba808d1
feat: add azure devops ssh setup guidelines
2026-01-15 12:01:23 +01:00
Bjarke Sporring
9e03a9624a
fix: verification of answers for history
2026-01-15 12:01:07 +01:00
Bjarke Sporring
b2b8a2cfff
feat: make the steps more explicit
2026-01-15 11:45:58 +01:00
