Uploaded image for project: 'Documentation'
  1. Documentation
  2. DOCS-5786

Advise setting the "upstream" repo in our github 102 tutorial

    XMLWordPrintable

    Details

    • Type: Task
    • Status: Closed
    • Priority: Minor - P4
    • Resolution: Incomplete
    • Affects Version/s: None
    • Fix Version/s: 01112017-cleanup
    • Component/s: about
    • Labels:
      None
    • # Replies:
      2
    • Last comment by Customer:
      true

      Description

      In the github-102 tutorial page for contributors there is a step #2 ("Pull in changes made by others") we instruct to them to run:

      git pull --rebase upstream master

      This will fail if they have not set an "upstream" repository. We didn't instruct them to do so in the github-101 tutorial. Also I think it's an easy mistake to think you already did that or to think git does it automatically.

      I suggest the following addition, shown in red below, that links to the shortest github.com doc on how to do it.

      (2) Pull in changes made by others.

      Pull in changes made by others since you forked your repo and replay your commits on top. (See here for how to set an "upstream" remote if you have not already done so.)

      git pull --rebase upstream master

      The operation “replays” your work on top of the commits that have happened since you began. For more information, see http://git-scm.com/book/en/Git-Branching-Rebasing.

        Attachments

          Activity

            People

            • Assignee:
              kay.kim Kay Kim
              Reporter:
              akira.kurogane Akira Kurogane
              Participants:
              Last commenter:
              Jonathan Dahl
            • Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:
                Days since reply:
                3 years, 46 weeks, 2 days ago
                Date of 1st Reply: