Pull Requests and Updating branches with master

Pull Requests and Updating branches with master

Please note that each branch that is being worked on, should be updated from time-to-time with the main branch (master) and the developer working on that particular ticket/branch/PR is responsible for updating the branch.

How to update your branch?

1. Go to master branch and make sure that you have the latest changes there --> commands: git checkout master (enter, then) git pull
2. Go to the branch you are working on --> command: git checkout < branch name >
3. Merge master into your branch --> command: git merge master [In this step make sure that you don't have any merge conflicts. If you have merge conflicts make sure to resolve them in merge editor]
4. Pushing the code to the remote after you are done resolving merge conflicts (if any)--> command: git push

When working with PRs and requested changes, make sure to always resolve particular conversations which your latest commit has resolved. Also, in GITHUB re-request review from @SuelaCark @nikolayninov (or other relevant assigned people for review). Keep in mind that we can't know/be notified if you have fully completed and fixed the requested changes without you resolving conversations and re-requesting review.

Note: re-requesting review on your PRs does not include asking us in-person or through messenger, rather its something you should do within Github.