Workflow Process - adammpolak/turnuptimesystem GitHub Wiki

MAIN REPO: https://github.com/adammpolak/turnuptimesystem/ (this repo)

THIS SHOULD BE SET AS ORIGIN.

Everyone works on a local feature branch. When this feature branch is ready, or if it needs to be shared amongst others, gets pushed to main repo as the feature branch.

to push to main repo:

git push origin <local branch name> (this will create a new branch that is identical to your local feature branch)

Now everyone can pull your branch locally to work most up-to-date, and when you are ready you can submit a pull request to merge into DEV.

Once we have merged into dev, everyone will pull to ensure latest working code.

WHAT IF I WANT SOMEONE ELSES WORKING BRANCH IN MY CURRENT BRANCH CAUSE I NEED THEIR CODE?

First ask the team member to push their working branch to the main repo. Once they have done that and you are on your local working branch run: git pull origin <team members feature branch that has been pushed to main>

Remember, this means if you are ready to submit a pull request on your feature branch, you are also submitting a pull request for that working branch you pulled in. This is important during pull request reviews because team members must be aware that some of the code is from another working branch, and should be disregarded during review.