Using your workspace branch - Brighton-FTC/FTC-2023 GitHub Wiki

🌿 Using your workspace branch

In order to avoid conflicts between different people's work, we are using Git branches. Please edit any of your own code in the workspace_<your username> branch, and merge it to the master branch (see this link) when you have finished a feature and tested it.

Switching branches

You can switch between all of the branches using GitHub Desktop, so you can see other people's work-in-progress, as well as the current production code and your own workspace. Please do not edit code in any branch other than your own workspace unless you are absolutely sure that it will not cause any bugs.

• Here's how to switch branches with GitHub Desktop.

Once you've finished a feature...

Please see the merging page for details on moving code between branches once it is tested.