PR Guide - sbmm/memes-to-dremes GitHub Wiki
Pull request workflow
Since we are working on a shared repository, the best way to submit your changes is to use the pull request workflow. Otherwise you will be directly modifying the shared repository, which could potentially override the shared files if you're not careful. The following link describes it best: https://gist.github.com/Chaser324/ce0505fbed06b947d962
Make sure you are making the push to your personal repo. Once it is there, you can visit your repo on GitHub and click the Pull Request button. Just make sure you are making it from the correct branch, which would ideally be your main branch. Once the request is made, you can merge it with the group repo, or you can let someone else merge it with the rest of the group's work.
If you want to learn more about common collaboration workflows, you can visit the following link: https://www.atlassian.com/git/tutorials/syncing
Pushing changes to your personal repo
Before submitting a pull request, you will need to push your changes to your own repo. In order for this to be as seemless as possible, you will need to first update your main branch with any changes made to the upstream (team) repo. To do that, run the following commands:
git checkout maingit pull upstream maingit merge {your feature branch}git push origin main
If you're unlucky, you may end up with a merge conflict. That means someone else has also edited one of the files you are about to push. To resolve a merge conflict, you can check out the following link: https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/merging-an-upstream-repository-into-your-fork.