gitting-it-right.md

Gitting it right

If you find yourself with a Git setup that isn't what Numberscope requires (i.e. do your work in your own fork on a feature branch), you might be able to use this guide to fix your setup.

Here are the different scenarios you could find yourself in and what to do about them.

• 1: You have a clone of a Numberscope repository.
  • 1.A: You haven't made changes.
    • Create a fork.
    • Clone your fork.
    • Create a branch.
    • Push a branch.
    • Now you are working in your own fork on a dedicated feature branch, congrats! Read about about basic Git operations below and get to work making a cool visualizer!
    • Read about basic Git operations.
  • 1.B: You have made changes.
    • 1.B.1: You are working on the main branch.
      • 1.B.1.A: You made commits.
        • Ask someone at Numberscope for help
      • 1.B.1.B: You haven't made commits.
      • Stash your changes.
      • Create a branch.
      • Create a fork.
      • Add the remote of your fork.
      • Push the branch to your fork.
      • Clone your fork.
      • Now you are working in your own fork on a dedicated feature branch, congrats! Read about about basic Git operations below and get to work making a cool visualizer!
      • Read about basic Git operations.
    • 1.B.2: You are working on a different branch.
      • 1.B.2.A: You have made commits.
        • Create a fork.
        • Add the remote of your fork.
        • Push the branch to your fork.
        • Clone your fork.
        • Now you are working in your own fork on a dedicated feature branch, congrats! Read about about basic Git operations below and get to work making a cool visualizer!
        • Read about basic Git operations.
      • 1.B.2.B: You haven't made commits.
        • Commit your changes.
        • Create a fork.
        • Add the remote of your fork.
        • Push the branch to your fork.
        • Clone your fork.
        • Now you are working in your own fork on a dedicated feature branch, congrats! Read about about basic Git operations below and get to work making a cool visualizer!
        • Read about basic Git operations.
• 2: You have a fork of a Numberscope repository.
  • 2.A: You haven't made changes.
    • Clone your fork (if you don't have it on your computer yet).
    • Create a branch.
    • Push a branch.
    • Now you are working in your own fork on a dedicated feature branch, congrats! Read about about basic Git operations below and get to work making a cool visualizer!
    • Read about basic Git operations.
  • 2.B: You have made changes.
    • 2.B.1: You are working on the main branch.
      • 2.B.1.A: You made commits.
        • Ask someone at Numberscope for help.
      • 2.B.1.B: You haven't made commits.
        • Stash your changes.
        • Create a branch.
        • Unstash your changes.
        • Push a branch.
        • Now you are working in your own fork on a dedicated feature branch, congrats! Read about about basic Git operations below and get to work making a cool visualizer!
        • Read about basic Git operations.
    • 2.B.2: You are working on a different branch.
      • 2.B.2.A: You have made commits.
      • This is the correct setup! Congrats. Feel free to read about basic Git operations.
      • Keep working in this fashion.
      • 2.B.2.B: You haven't made commits.
        • Commit your changes.
        • Now you are working in your own fork on a dedicated feature branch, congrats! Read about about basic Git operations below and get to work making a cool visualizer!
        • Read about basic Git operations.