There are two branches in the repository; one for the Frontend and Backend development each
-
Fork the appropriate repository depending on what you're working on and the changes you want to commit to the main branch.
-
Clone the forked repository to your local machine computer:
git clone https://github.com/zuri-training/Auth_Wiki_Team_3.git
-
Pull from upstream to download all changes in the project using
git pull upstream main
-
Open the Project up in your local Editor
-
Complete your assigned task.
-
When you are ready to add and push your new commit to the Repo;
git checkout -b <branch-name>
git checkout <branch-name>
git branch
git status
git add file_name
git commit -m "Commit message"
git merge <branch-from-which-to-merge>
-
To make sure there are no conflict, Pull from upstream using
git pull upstream main
-
Push your branch changes to the Repo using
git push upstream main
-
Once you push the changes to your repo, the
Compare & pull request
button will appear -
Click Create pull request to open a new pull request
any questions should be directed to the team lead @KingPanda68