Pushing Your Code to NGITOSS/discord-bot

October 11, 2021 · View on GitHub

We hope you enjoyed working on your task and followed all the guidelines in CONTRIBUTIONS.MD

Now that you need to send us your code we got you covered

If you exactly followed the tutorial before you will now be in your working branch( which you have made all the changes on )

Stage and commit your files using git add . && git commit -m "good commit message"
Checkout to the main branch using git checkout main
Fetch the upstream and merge changes using git pull upstream main && git pull upstream develop
If there are any merge conflicts resolve them
Then checkout to develop branch using git checkout develop
Merge your working branch with develop using git merge working-branch
If there are any merge conflicts resolve them
Push this branch to your github account using git push origin develop
Open Github where you can see create a pull request
Remember to make pull request to develop branch of main repo