Skip to content

5-PR.md

Latest commit

 

History

History
47 lines (24 loc) · 1.59 KB

5-PR.md

File metadata and controls

47 lines (24 loc) · 1.59 KB

Steps to creating a Pull Request (PR)

Step 1. Sync your local repository with upstream

Ensure that your local repository is up-to-date with the changes in upstream.

  • Sync your branch with upstream git fetch upstream master

  • Pick commits from upstream git rebase -i upstream/master. In case you get conficts, resolve the conflicts manually by going to the files having conflicts. Either accept the incoming changes from upstream or keep your local changes.

  • Add the file git add . In case there was conflicts, do git rebase --continue followed by git add .

  • Now make a commit with comments git commit - m 'first commit'

  • Push changes git push origin +feature-1

  • Check if file was added to feature-1 branch of origin

git branch console

git branch console

Step 2. Create a pull request

  • Go to upstream repository on GitHub web page. Click on Pull Request Tab. Now click on New Pull Request green button on right hand side.

git branch console

  • Add a title. Leave a comment describing what is in your PR

  • Add reviewer. In this case your teammate wil act as your reviewer.

git branch console

  • Click on the green button that says Create pull request

  • Check PR

git branch console

  • Check your commits in PR

git branch console

  • Check modified files in PR

git branch console