Updating Your Pull Request

$\newcommand{\N}{\mathbb N} \newcommand{\Z}{\mathbb Z} \newcommand{\Q}{\mathbb Q} \newcommand{\R}{\mathbb R} \newcommand{\lt}{<} \newcommand{\gt}{>} \newcommand{\amp}{&} \definecolor{fillinmathshade}{gray}{0.9} \newcommand{\fillinmath}[1]{\mathchoice{\colorbox{fillinmathshade}{$\displaystyle \phantom{\,#1\,}$}}{\colorbox{fillinmathshade}{$\textstyle \phantom{\,#1\,}$}}{\colorbox{fillinmathshade}{$\scriptstyle \phantom{\,#1\,}$}}{\colorbox{fillinmathshade}{$\scriptscriptstyle\phantom{\,#1\,}$}}} $

Section 5.5 Updating Your Pull Request

At this point you have resolved the merge conflict on the feature branch in your local repository. What is left is to push that branch to your origin. When you do so, GitHub will automatically update your pull request to the upstream for that branch.

Exercises

1.

Push your modified feature branch to your origin. Give the command you used and its output here.

2.

Now visit the upstream repo and find your pull request. You should see that it can now be merged automatically.

If your PR cannot be merged automatically you have not correctly resolved the merge conflict; return to Exercise 5.3.1 and try again.

!!Give a screenshot from your pull request showing that it can now be merged automatically.

3.

Give the URL of your pull request.

You have attempted of activities on this page.

Prev Top Next