Welcome to the Cargo Connect GitHub Repo!

[IamPatrickSturgill]

Hello everyone!

This is our repo for this year's competition.
Using GitHub is new to all of us, so here are a few things to note and remember.

The Repo

• We keep our code here in the CargoConnect repo. Make sure to not only save your work on your local computer but on GitHub as well (push your commit).
• There's a kanban/scrum board under projects called Cargo Connect Season Board. We'll use this for our daily standups.
• You're currently in a discussion. So you've seen our discussion board. Here you can make your own discussions where you can ask questions, leave notes or ideas, and communicate with your team about your project and code.

Branches & Pull Request Approval

• When you go to edit your code, you will want to work from a branch that's not "develop" or main. That way you can create a pull request to put your code, once finished, into "develop". You can't work directly from "develop" or main and then push your changes since both of these branches are protected and require pull request review.
• We work in our branches for our specific projects and tasks, then once we're happy with those we create a pull request to develop. Every now and then when "develop" has been cleaned up and most of our current projects have been added to it, we can do a pull request to main. Main is what we will use in our competition.
• Pull requests going into "develop" only require one reviewer. Any branches going into "main" will require 2 reviewers.
• You can manually add reviewers in the top right corner of a pull request. Coders and the Code Organizer make the best reviewers, it doesn't hurt to have a coach give you feedback also But they shouldn't be your first reviewer. Make sure to ask another team member first.

Troubleshooting

• Having trouble because you're not seeing a merge conflict in Visual Studio code, but your pull request is telling you that you can't merge because you have conflicts?

Try the following:

• Open the branch you're trying to merge (the one you were just working on probably) in Visual Studio Code.
• Choose the branches > merge branches option from the three dots near the commit checkmark.
• Your conflict should load in and you can fix or choose the correction merge options.
• Save your file and make another commit.
• Make another pull request. This should fix your issue.