Saving and Uploading Code

💾 Saving and Uploading Code

Once you have made changes to the code, please follow the instructions below to upload them, ensuring you build the code first to check there are no syntax errors. Make sure you have joined the GitHub organisation and set up the development environment.

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

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

3. 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.

4. Click Push origin to upload your changes.

---

⚠️ You might get a "merge conflict" screen if multiple team members have edited the same code and Git does not know how to merge their changes. If so, please click here.

GitHub Desktop (Before)	Android Studio (Before)	Android Studio (After)	GitHub Desktop (After)

1. Open the project in Android Studio.
2. Navigate to the files GitHub Desktop mentions as conflicted (here, README.md, but unlikely to be this for you). For each file, part(s) of the code will have changed to (Maybe find it with Ctrl+F):

<<<<<<< HEAD
(One version of the code is here.)
=======
(Another version of the code is here.)
>>>>>>> (Something like) c6a5a47039c43cc2d0f6d3d0c9ee1cfbdd0bcb24

4. Choose one version to keep from each block like this, by removing all of the added text except for one version of the code (line 2 only or line 4 only in this example).
5. Repeat this for each block - there may be more than one per file.
6. Try building the code to check there are no errors.
7. Open GitHub Desktop again, click the "Continue merge" button that should appear, and click "Push origin" again.

---

5. You should see your changes ("commits") here:

https://github.com/Brighton-FTC/2024/commits