floppydiscen
  • Joined on 2026-01-05
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 16:30:15 +00:00
a895abdd03 feat: drastically simplify tasks for multiplayer
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 16:29:58 +00:00
356b6268ba refactor: remove advanced for now
floppydiscen pushed to advanced-commands at floppydiscen/git-workshop 2026-01-15 16:29:51 +00:00
e2e36690ea Revert "refactor: remove advanced for now"
356b6268ba refactor: remove advanced for now
Compare 2 commits »
floppydiscen created branch advanced-commands in floppydiscen/git-workshop 2026-01-15 16:29:51 +00:00
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 16:25:47 +00:00
bd69774191 feat: drastically simplify the multiplayer module
fcaf97f60b refactor: simplify the multiplayer part
2a5eb137f6 fix: stash challenge
Compare 3 commits »
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 15:38:03 +00:00
b0d2d43c8b fix: stash issues
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 15:29:16 +00:00
cdd695b250 fix: cleanup revert module
0474a6de0e fix: remove revert-middle challenge
Compare 2 commits »
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 15:12:46 +00:00
575e083f33 refactor: rewrite the merge-revert section
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 14:51:03 +00:00
aa24c50b45 fix: revert conflict
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 14:42:59 +00:00
939bd397f1 refactor: move 08 down a step
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 14:41:34 +00:00
3130874981 fix: cleanup cherry-picking tasks and tips
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 14:22:57 +00:00
a34b7d155f refactor: move reset to advanced
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 14:20:43 +00:00
1c20a06c21 fix: cherry-pick conflict
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 13:31:41 +00:00
988ce3bc92 fix: remove subproject "challenge" folders
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 13:31:08 +00:00
9fbdd941fa feat: check for mainbranch
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 13:30:23 +00:00
40341d21a7 fix: add suggestion for a new file for branching and merging
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 13:22:22 +00:00
8a82253fc2 fix: add better explanation of merges
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 13:07:36 +00:00
f0522e14bc feat: setup merge and diff for git
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 12:56:07 +00:00
0183a06134 feat: set git defaultBranch to main
floppydiscen pushed to refactor-reset-revert at floppydiscen/git-workshop 2026-01-15 12:47:41 +00:00
c3d9d3337c refactor: add better instructions for branching and merging