Saving and Uploading Code

💾 Saving and Uploading Code

Once you have made changes to the code, please follow the instructions below to upload them. Make sure you have joined the GitHub organisation and set up the development environment.

Please ensure you are on the right branch for your feature first (here's how to create one). You will get errors if you try to commit directly to the main branch. 😢

1. Open GitHub Desktop, and Fetch origin in the top bar.

2. Once this has been completed, Pull the changes that others have made.

3. If you get this Merge Conflict error (a), your code clashes with somebody else's and Git cannot understand how to fix it. Open WPILib VS Code and ensure each of the files mentioned is fixed by selecting "Accept Current Change" or "Accept Incoming Change" then saving with Ctrl+S, as image (b) shows. Enter GitHub Desktop and click "Continue merge" (c), then click "Push".

a	b	c

4. After you have made changes to the code, they will show up on the right-hand-side of the screen. Add a title and description for your change, and click Commit to main.

5. Click Push origin to upload your changes.

6. You should see your changes ("commits") on the repository at GitHub.com.