-
Notifications
You must be signed in to change notification settings - Fork 3
Expand file tree
/
Copy pathFork update.rtf
More file actions
20 lines (18 loc) · 1.88 KB
/
Fork update.rtf
File metadata and controls
20 lines (18 loc) · 1.88 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
{\*\generator Riched20 10.0.17134}\viewkind4\uc1
\pard\sa200\sl240\slmult1\f0\fs24\lang9\par
\pard
{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent0\pnstart1\pndec{\pntxta.}}
\fi-360\li720\sa200\sl240\slmult1\i\fs28 Open your fork of the repository.\line\par
{\pntext\f0 2.\tab}Click the compare button.\line\par
{\pntext\f0 3.\tab}This will open a page titled Comparing Changes and if you look carefully you'll have jumped to the upstream version of the repository. If you were to do a regular pull request then this makes sense as you'd be bringing your changes into the upstream version. But in this case we want to flip the direction and pull changes from the original version to our fork.\par
{\pntext\f0 4.\tab}Change the base fork to your repository\line\par
{\pntext\f0 5.\tab}You're now back to your fork but you've also asked to compare two identical repositories so GitHub thinks you care about branches not forks. Click on compare across forks to get back your base fork option.\par
{\pntext\f0 6.\tab}Change the head fork to the upstream (original) repository\line\par
{\pntext\f0 7.\tab}You'll see one of two options:\line\line 7.1. "There isn\rquote t anything to compare" This means you're up to date and you don't have to do anything. \line 7.2. A list of commits. These are the changes that have happened in the repository since you forked your version. \par
{\pntext\f0 8.\tab}Create a pull request\line\par
{\pntext\f0 9.\tab}Note that this pull request is to you! So you can confirm that it's ok and merge it when necessary. And if there are any merge conflicts then it's up to you to figure out what's gone wrong and sort them out.\par
{\pntext\f0 10.\tab}And now you're ready to continue working on your fork.\line\par
\pard\sa200\sl240\slmult1\tab\tab\tab\tab\tab Well done!\par
}