release/first-prototype. Please base all branches here.
Add a branch above branching on release/first-prototype
NOTE: Please name your branch
feature/some-feature- for a new feature for the releasebugfix/some-fix- for a bugfix for the currentrelease.
Instructions:
- Open Windows Terminal/Powershell.
- Go to the directory
git commands:
git fetch- Update the meta data about the remote git repository(see if you're behind on commits or if there's a new branch. Usegit fetchto update your local git repo when you create your own branch.git checkout <branch_name>- To switch branchesgit pull origin <branch_name>- To update your local git repository. Use this when you create a new branchgit push origin <branch_name>- To push your commit to the remote git repository.
Then, create a pull request to pull your branch to the release branch. I will merge when it's safe.
The purpose of this is since we're working separately, if we both work on the release branch at the same time, or if we have our "own" branches but we will only commit when it's
finished, there will be merge conflicts after. Therefore, only one person should work on one file to avoid merge conflicts. If you see something wrong with my code, tell me instead
of fixing the bug as that will result to merge conflicts which are a huge pain in the ass.
Please commit as much as possible and start a pull request as much as possible(but do not merge as that may create conflicts) so we'll both be updated as much as possible.