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, dogit rebase --continue
followed bygit 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 oforigin
- Go to upstream repository on GitHub web page. Click on
Pull Request Tab
. Now click onNew Pull Request
green button on right hand side.
-
Add a title. Leave a comment describing what is in your PR
-
Add reviewer. In this case your teammate wil act as your reviewer.
-
Click on the green button that says
Create pull request
-
Check PR
- Check your commits in PR
- Check modified files in PR