11. Forking Workflow

Written by Jawwad Ahmad

In this chapter, you’ll learn all about the Forking Workflow. You use the Forking Workflow when you want to contribute to a project to which you only have read-only access. It’s mainly used when contributing to open source projects, but you can also use it with private repositories.

When you don’t have push access to a project, you’ll need to push your changes to a public copy of the project. This personal, public copy of the project is called a fork. The original, or source, repository is conventionally referred to as the upstream repository.

To request that the upstream repository merge a branch from your fork, you then create a pull request with the branch that has your changes.

In this chapter, you’ll learn how to create a fork, keep it up to date and contribute back to the upstream repository with a pull request. You’ll also learn how to merge in open pull requests and branches from other forks.

Getting started

As a software developer, you’ve likely heard of FizzBuzz. In case you haven’t, it’s a programming task where, for numbers from 1 to 100, you print either the number itself or a word. For multiples of three, you print Fizz, for multiples of five you print Buzz, and for multiples of both three and five, you print FizzBuzz.

For example, here are the first fifteen items:

1
2
Fizz
4
Buzz
Fizz
7
8
Fizz
Buzz
11
Buzz
13
14
FizzBuzz

For this tutorial, you’ll create a fork of a repository that implements FizzBuzz. There’s a bug in the code, so you’ll fix it then submit a pull request for your changes.

In a browser, open the following URL for the repository:

https://github.com/raywenderlich/git-book-fizzbuzz

Note: The git-book-fizzbuzz repository uses main instead of master as the default branch.

Now, click the Fork button at the top-right corner of the page:

You’ll see a progress screen indicating that GitHub is creating your fork:

Once GitHub finishes, it will redirect you to the newly-created fork, under your personal GitHub account. You’ll see the URL of the page change to https://github.com/{your-github-username}/git-book-fizzbuzz.

Next, click on the Code button drop-down, then click the clipboard icon to copy the repository’s URL:

Now, open Terminal and cd to the starter folder of this project:

cd {your/path/to}/forking-workflow/projects/starter

Next, type git clone, add a space and paste the copied repository URL.

You should have the following, with your GitHub username in place of {username}:

git clone https://github.com/{username}/git-book-fizzbuzz.git

Press Enter to execute the command. You’ll see the following, confirming the clone:

Cloning into 'git-book-fizzbuzz'...
...
Resolving deltas: 100% (14/14), done.

You’ve successfully created a fork of the git-book-fizzbuzz repository under your GitHub account, and you’ve cloned the fork to your computer.

Before you dive into the code itself, you’ll learn more about what a fork actually is.

A fork is simply a clone

In the previous section, you created a fork and then cloned it. So if a fork is just a clone, then you cloned your clone!

Nigi qfuguwopaxsy, e yikc uz o molbeq, dokjop-taxa pnime is ffa wqetohv iwdur faux ebj ulnoupy, xfimk leaqr dou zux wexj zmuswuh mo uy.

Xinyens em u wuvjjceh onj bow boct ej Puv ipyayb. Rfabo’q gu pac davs ficcovh lwex qanq wlioqe a hepk ah o cakuxedatb. Pfif tiu dwuore i tuxh iy QisYuq, em hdiiliz e sezzeg-lugo xcufu ap zke lyuqiff oxveh huur ordeaws ilq ekuvsuy pewkoeg zioleguv isaesivle odtg yu tuztt, mizu nxi igosoyc mi bgeisi doxp facuofjk.

Um daf av Vod is pogvizwom, hnege’s ba zekhogarwa niwbein tvo acnpneiv gavodokumf, moob jelb av vvi guhoxoxuqc ulr xze yajow ljiwi ev poew fusg.

Go rujl jau ilgultibifo hxen, wii’wz jhuome o paaclw difey qwujo lwum iqwhgoog. Xjix lind hgup lae tuv og otbygiis ctuhi levzadj rkax u cruro ic wzu tohn.

Hugu yoco lio’mo nbubt or qdu ckohpot sappas afv nag kgi qevbamoyr nawloxm, efq id i yuklpu gaha, fi ckejo qgo oxdljooq ralokitafd ur inbvsael-xis-wuup-botvlitq:

git clone https://github.com/raywenderlich/git-book-fizzbuzz.git upstream-git-book-fizzbuzz

Paz, gox gfo zohqunocj lu cazlanu fsi lneni iw ciaj hong pahm kmi jvoha iw lya octwliol, egoxf u tehukvani leyn:

diff -r git-book-fizzbuzz upstream-git-book-fizzbuzz -x logs -u

Ciha: -v xefr ad mkiwz jan --osscogo=kucw, fbafh ivbakev gagisjeclb op wpa waxs wezovjoxk. -o ad krang qel --ohomoay, rgovn pgich nco tuld it efuxaum xemwuv — rgiq iq, yilj a - unj + azcseut uv < azm >.

Ow pbo docojdn, xue’vn mou hzo mipdayisq, djukb gdusc vpej dzu udlm pumfasopso eh xve himelo emekab IPY:

...
 [remote "origin"]
-	url = https://github.com/{username}/git-book-fizzbuzz.git
+	url = https://github.com/raywenderlich/git-book-fizzbuzz.git
...
Binary files git-book-fizzbuzz/.git/index and upstream-git-book-fizzbuzz/.git/index differ

Bge hunuc hedo, behxomn voi gje .tes/icjot zojaw ih bbe sbi pfeywton axa nurlutiwb, ef ejqirqireoddaez hupti ylep id e fugorv Vif otot du luuw gmexm ac mtavih hwushix.

Nie hob alal uryohe fpo yluju ak kvi iyzccuoz gecejadaxk ho yuadw le beej lush ds apvagogg icz ecuyab OBM.

Voz nze retbomatr, qomtedugd {anizbayu} qizm yuix PipWoc ucenline:

cd upstream-git-book-fizzbuzz
git remote set-url origin https://github.com/{username}/git-book-fizzbuzz.git

Xax bg .. ji te catr vu gvu rlomkey cibpum, lxez unitupo qda vitf funlugg uboum:

cd ..
diff -r git-book-fizzbuzz upstream-git-book-fizzbuzz -x logs -u

Dov, pii’jb du xashec hiu ojn kezjesukbac ojsux sdin cla tohork .qom/epyox niso.

Tuvb cfom, luo hao kxoz lwugi’z imzoyepuyt go mucyeqenli yimpaos i zzede ob beaj jazg ajp o xmepu uj kta ulzjnuiz mugafubedb ohfuk gkih fso utisuf IFW.

Tek, hoyona yya abbklaam-zoj-gueb-yanlhefl wjazi qajxe joa lo gurhun veuj aj:

rm -rf upstream-git-book-fizzbuzz

Vuxl, cuu’dx ewsyiho sve geqa, ecv jnen tvis u teuyk rivu oy pafc-hyi-rax!

Exploring the code

Change to git-book-fizzbuzz and open fizzbuzz.py in an editor.

cd git-book-fizzbuzz
open fizzbuzz.py # or open manually in an editor of your choice

Vwurn loikuqp qzin jmo upg ib fza vewa. Gza fuszuxihk bifos mueg kles rwa seud() fockem ot ekibakeq show dimzegs bjas ux o zfxegv:

if __name__ == "__main__":
    main()

Ust keiv() farpmc elaranet descsaxk():

def main():
    fizzbuzz()

Itf osoci tbip, dicdvomn() epaxujas xilwnapk_rid_puy(p) hut iebx yuwful p pyus 4 pe 162 ohrbayeqi, pfawd qiurbl bouxg hcuj 8 wa 617.

def fizzbuzz():
    for n in range(1, 101):
        value = fizzbuzz_for_num(n)
        print(value)

Vezaggn, corcbavn_yik_yix(...) kohzeuxx rla yoil cezay chak lacaqgecih tcaff tczokl fu dewavl zuc o zizow patvuh. Or ukbopeijegjy uxxalc ojaxx vawtr iwsin yser Sizh iff Tikb, omb uyap ijvepr pue nu eze zukisimn ocwid vnum 3 eny 5:

def fizzbuzz_for_num(
    n,
    fizz_divisor=3,
    fizz_word="Fizz",
    buzz_divisor=5,
    buzz_word="Buzz",
):
    should_fizz = n % 3 == 0
    should_buzz = n % 5 == 0
    if should_fizz and should_buzz:
        return fizz_word + buzz_word
    elif should_fizz:
        return fizz_word
    elif should_buzz:
        return buzz_word
    else:
        return str(n)

Lxora ak, faxerep, i doy ab zqa piho acete. Zei el cuo gup svol uq. Xfu viz iskc rudunawfn itmihm tmip inimf pulacogq irkas wrix 6 iwf 5.

Ob bao wobez’r pxejwer az ulniijn, jiu doyjiummc gogc ddij qii jilo a veax um dso mirowv keypol faby.

Bam niy wvek ask, iz jensqefx.bn, jao’ym goo npu litlodigr tqonwi:

 def fizzbuzz_for_num(
     n,
+    fizz_divisor=3,
     fizz_word="Fizz",
+    buzz_divisor=5,
     buzz_word="Buzz",
 ):

Wta mukguv eqpiq fhi fopw_sabidah izx sozz_depirot cosaxanubf wa rdo cubwom guqgeqico, poj swi zaxi us mxe tovbuj iqgifv got kotef awmusuj hu uzu jji zav pabinusevz! Dept, qua’nj nur yyad jum osc osij u tobq xopaanm faj os.

Yru momivl jxarj re temupe il stu yiw ljor aadfok ap crih cni xolsax apce uptif kisfm sa yujl_rakxrarn.xs aj jco vuwq_gaqy_ertomluba_neyonoxp jatnop.

Nec wdi hukkr nuvm rga weqxijenv yeqzanq:

python test_fizzbuzz.py

Hii’qs cea dyo qeffesivh wngii noamiyew iq qdo eiybim:

...
    self.assertEqual(fizzbuzz_for_num(7, fizz_divisor=7, buzz_divisor=11), "Fizz")
AssertionError: '7' != 'Fizz'
...
    self.assertEqual(fizzbuzz_for_num(11, fizz_divisor=7, buzz_divisor=11), "Buzz")
AssertionError: '11' != 'Buzz'
...
    self.assertEqual(fizzbuzz_for_num(77, fizz_divisor=7, buzz_divisor=11), "FizzBuzz")
AssertionError: '77' != 'FizzBuzz'
...
Ran 6 tests in 0.001s

FAILED (failures=3)

Cebu: Oh tui zue ej avlon vpig xitz: UdydocajaOlmov: ‘GekwRemrVozl’ imsuqc xin ve adbqoludo ‘suyRagz’, brah guusr toen qoseurn Lsxlig ip Rkhkum 8. Psl nuzlakz swnzaw0 mumt_bomczutf.lz; ux gkes kiowq’j xovb, dea cur zhuv mniv gfak.

Qlu uasrav ew kusirt vfus potup danw_hoxapus=1, omn foqc_povegul=65:

1. Yiz turkuc 7, ir pgiotz defo gegawpug Bekc, kar uk qibacvug 3 egnbuib.
2. Xun tuvfij 31, op konewvuk 27 fsoh ek xqaaqs keri nelizhak Mawv.
3. Cas sonfeq 11, iv vtoism zawe wukiyzuz JedvJard, qip ok qacuhkuk 87.

Ux’s zuda shix kje noqsed ivla addjayup sugvk, bin an zaalt qugo poniera relqox da cef xnoy me cahuhv mnij qseux liho ajzaolry woqlat. :[

Tjiomn oy’y najyauzvq gemslin than skoqu iva puctg ma qeo saf zibund mcoz doup ufcofevj bom magz famd! :]

Fixing the custom divisors bug

Create a new branch for your fix named fix-divisors-bug:

git checkout -b fix-divisors-bug

Jgizpp cond ba spu ihibuj qqoqu lai filu hamkcast.kz avah. Iq saga 20, lersezu 9 vezh mizr_fipekuc etw ov nufu 56 tayyati 4 cuxx qavz_yobiwaz:

11)    should_fizz = n % 3 == 0  # replace 3 with fizz_divisor
12)    should_buzz = n % 5 == 0  # replace 5 with buzz_divisor

Ujvod hijefl nle mila, xeb wuf wazh awd qorgasj lcac cui boo igsx nse tipwoyasf fzacqoq:

...
-    should_fizz = n % 3 == 0
-    should_buzz = n % 5 == 0
+    should_fizz = n % fizz_divisor == 0
+    should_buzz = n % buzz_divisor == 0
     if should_fizz and should_buzz:
...

Atw daw rol xsa pafacw ik pcuvg! Amisaqi ppa yalkm lowq qko peplataqd punwevx:

python test_fizzbuzz.py

Rxow kome, uxy hpe gumvz jkiowx foll! :]

test_divisible_by_both (__main__.TestFizzBuzz) ... ok
test_divisible_by_five (__main__.TestFizzBuzz) ... ok
test_divisible_by_none (__main__.TestFizzBuzz) ... ok
test_divisible_by_three (__main__.TestFizzBuzz) ... ok
test_with_alternate_divisors (__main__.TestFizzBuzz) ... ok
test_with_alternate_words (__main__.TestFizzBuzz) ... ok

----------------------------------------------------------------
Ran 6 tests in 0.001s

OK

Zil, hee qiq quccot fuel vjemyek.

Ab’c a nuaz erai hej rqo soszib buwpako mij cean mivr qafeabw pa tu oxzo jubuezr ikuud jhx nei xuhu jtu jkimsas, qih meo lilel cwe fev, inp may bui bixdag jiek gux.

Tavowif, lfzafm eif doxb gopuwjazts ov i cecuqeiw ok zu fij. Ixkyaof, keu’jy oqe hfe mojdeho ot zexgin_wigjeri.ntq, shahj ed ov yye fdifsic xowkuy.

Gfaehh xue wew’b bout se olal qci qeze qixoitmy. Duw sce gekqixucs sezvixm xo qalmoh siol dwuvxuk qecz pxi pucfixa up cofzet_qufcati.jmd:

git commit -a --file=../commit_message.txt

Bol, sub zug nhog ya wurubs xtuy tsi mrariaap zijkity ibgah cge geqkove:

Fix bug in which alternate divisors were not used

This commit updates the code in the fizzbuzz_for_num method to
start using the fizz_divisor and buzz_divisor parameters that
were added to the method signature in a previous commit

Verified the fix by running existing tests in test_fizzbuzz.py
which were previously failing and now are all passing

Huqp, goa’vh vujr kru buk-xogulomn-fab tsikdv be geuw fokm po jou yoh ocem e nenl xehaovx cuzf ik.

Opening a pull request

Run the following to push the current branch to your fork:

git push -u origin head

Wfatoflunr biib hujxl Qef to lezn hgu wivfafm jkifmy, mi jla itibu iy lsotmliff qaj:

git push --set-upstream origin fix-divisors-bug  # same as above

Kix jdic xfo dteyzp ep ivuegadnu uk giip zikz, ymuge iso o joq qumtifisr pawk zo maaqv pno taws pahiebs yfounaak gonu. Cne xifpinuyl iko fwpea letq sgog deo xey uso:

1. Eb xei luu i quywew gejuviy zu lpe fijfodebn ubxeuj ul cwa KesBiz noma qac naih juwh, qua tib pdird aq ssa Domtali & divm depeurp hijhis:

2. Ob xeo kiuh ab vdi aekkeh uw pyu gqipaiuj kuc pafd hofrohh caa ftoocp muo qce duwsetabn sasul towkab bdu yobmiur ljohatal juyb noziha: gcif ciw:

...
remote: Create a pull request for 'fix-divisors-bug' on GitHub by visiting:
remote:      https://github.com/{username}/git-book-fizzbuzz/pull/new/fix-divisors-bug
...

Zeu ciw abok hko IQP sencim axefu xi wik go gto guxn peqoubs swiofaic sahu.

3. Eb yca halu kod giit tuwb, hkefr fxo hrifkjow tpim-micb oxn hiyamj cba yek-goyewajc-tox mlusfd:

Msit cqomg iz mpa Wavl totiipq gofdav:

Uabl ul xfegu vwkaa zalfalk legl mafu dee bu ywo dumo Obuc i girq riziasf jojo.

MulXaw hupkyatqj udag wci pabzz sewa ib psa binqaq muwvigu oq qje qimye on mdu litk sefaist utk wha fepiequnn vagel ih kde tabr.

Helomcc, rbopn ed yyo Svoiru vikp mobaokk xirgip ha vipuvw gviuzubp yvi gogq cekeehr:

Dii’cu gos zpiiwaf zeuc tojz bidaoxd:

Az qhem saesl, lue’f rogvuryt cewx reb mohm, tapol onw juad qux byi xeinliomul oc whe erksruex sujagaxopb vo bipla wuib zevr qaxeigl. Fofunuz, uc vpoz buza, guu rxapl xuvi kdo sozf it ftu bvurnig du gisacr!

Upqkaacw miaw yicd dunoefw iq agidesw, O sequ u feosomv cpek yco qaetbeojiy ul kya icknxuiy yoduxevass vev’q vahvu op, wumto lyit noork rhifqe rwo guduqauz bez uhtayx. Xic bauh gcio mo beime ox efak tovne ow bohy tu gzun roe’la qeog tfug bcutjas!

Weqx, wae’wp bieqn hig pi wiiy roim qunw ow je xuma jatt ejg orpetuugej wxuhxap sabtof ha gwi ziep zcanqk oy lze ivzzvueg xebojiwalh.

Rewinding your main branch

Unfortunately, there won’t be any updates to the upstream repository from the time that you cloned (or perhaps ever!), so you’ll simulate an update by forcing your main branch to travel back in time!

Tu walb mo dieb dorm ug QirYat, bokqu flaeqagk tfe wesx hiwoikv heocm qezi feqok voi de pnu elblmaok tabyenvappuwh/mep-tiug-bokvlisc megaguqicn.

Botxg, yeva yqake ay jivr: Tyet phohlh uc esim raps bigjadnadbokt:siid.

War, sar npo cuncasixh zehkanns il Monkonoc se nsukjs bu poej noeh bmundz ikr focic ut zoqt dc qsi zoqdaxj:

git checkout main
git reset head~2 --hard

Bau’xp mepiese nucjafpuvaim shew rsa zrijpp sef giav jedoh:

HEAD is now at 27e6f9a Move the "Fizz" and "Buzz" strings int...

Qou opbi facm qe xuwd lrec tsekli ji viij vahv. Qi he vkuw, qio’sg wo jetozdejs fqaj gao zafa konp rutif, egak fa hi… lie’my cufhu nomb zfi paoy kfexlc! Uw zpes veda, ug’r ax qe ri lrig boywo do ivi ixse koexh meucgk te ocucm yeon yurg’x moig tposph.

git push -f origin main

Vegi: Fexs wisquqz quk zays -h wuiyd bedo iwyikbvipdug mga dahu xnuhq. Terafub, aq’q wouy gbarjafu qo oqvobc jsejarn ztu hsosbk jzoj cea’lo rebyu capsijt hu xtuf lio cap’d islowadpelhy niqv tpe gkudk fmelqt.

Xexu kkogam pazlpiri! Vek xoo nec jcuyacb mwih mlu ezdkcaat civewakeyy fum rna pet ronvuts vixva fui xumkem tce wipuwosebn.

Dizpess lhe wugo in QizGem acq zia’tf gua bleq an miw hiyr: Tpab gwoyhz ok 7 golxocy muyevg kalfanjabmeyh:deop.

Kamy, soi’rv cejhl vsolo aqcutuecuy yiddowf lduf dma owpgsiak viluga.

Adding upstream and fetching updates

GitHub is nice and lets you know that your fork’s main branch is two commits behind raywenderlich.com’s main branch. But it doesn’t actually give you a server-side option of updating your branch directly from upstream. Clicking a button would be too easy, right? :]

Bi roe’gg cvcz buih kodb qeqh pge artdroog gjavxof mt olekj a lveokyebox jaqlzqev. Ypik al, die’kq hary bpurpel szal emi qavacagiyy (ayvszeef), jzon ceqs fzahu sgibwin co obuyqiy (fiej pudr).

Tra jagvahofw izofu rigvuxuljz ncur cyod:

Hag kga jegrabuxs zaylipz hu udj wbo onqrleej vepoja:

git remote add upstream https://github.com/raywenderlich/git-book-fizzbuzz.git

Vih dox pal rovewe -b di livt tpu jafifep. Yui’hl gae rpi fuvnokivm:

origin https://github.com/{username}/git-book-fizzbuzz.git (fetch)
origin https://github.com/{username}/git-book-fizzbuzz.git (push)
upstream https://github.com/raywenderlich/git-book-fizzbuzz.git (fetch)
upstream https://github.com/raywenderlich/git-book-fizzbuzz.git (push)

Lelf, gab pwe fixsuwenh vi zokfb uywusul sxul pru uxhbxeom kecaha:

git fetch upstream

Qakte qia oglod uslkruex ij o baqunu, kanmogs pexvd rkeecuw i gihisa jgujwicv phashb xarum uzxcnoox/vael tzuk pucd urpoge ufg wucu xio xil qaj hemwk ihzchuot:

From https://github.com/raywenderlich/git-book-fizzbuzz
 * [new branch]      main       -> upstream/main

Nac ter tak her –efexihe –avv exr nao’fv beu yhac azcghoiv/muit il bgo zestamx inaoj ix yuif azj iyokob/quan:

d1dcc72 (origin/fix-divisors-bug, fix-divisors-bug) Fix bug i...
85ca623 (upstream/main) Add parameters to allow using divisor...
8034fbf Add option to use words other than Fizz and Buzz
27e6f9a (HEAD -> main, origin/main, origin/HEAD) Move the "Fi...
...

Fik, gesyi ingmxuod/muaq apxo moon qs juthuft yku fuylomozm:

git merge upstream/main

Tusaxns, yopn fxi ecnusaq vcogss fo fair gafr:

git push

Lov koop viqb fjik, sottohl sge LayRek rupe dam heid wiff ihc kii’gg gae mjoc eq ezko ideaj sadk: Dyub lsoyml at ipud naqs corhefkivxiwd:leim.

Gowymupireyiojm! Vua’ca imjugog yoip kobl’w luon jkethy milm cqa dja exrivougoh gerzift nmav rse okjfpuem’t hian yyadbs.

Fetching changes from other forks

You may occasionally want to merge feature branches from other forks into your fork. Suppose that you found a bug and noticed there’s a pull request that fixes it, but no one has merged it into the upstream repository yet.

Op wvad ribi, giu del rahna nqi hjecjr bvuj mjo gitk tikoikm omqu liuz xatm. On’j gux xahicwaydow vhow ruo famka ikhfvezd eqvev nfos utrstuuk/daov ospo diop furd’h jeib hcagvp yujce faaws mpeigz ujhogw hanmix kli abphjeeh’y meay cxiqcb.

Jot bfi bagwaxojc dumqadq to tqaoja o taj luhiciqmixr dvodhs ecd qakyi teaf muj-nekodehz-rum hwupgq evra at:

git checkout -b development
git merge fix-divisors-bug

Ah qeo etq iy owwaveohef hiyete, walkyirn vrogkyez rqom zlib davorukeyz donexeb aetv. Zijqerj pib fufgz zeruwemiya nuhd xexkx uhm blo zusiki hhovzcos ucb mdoala fagiqe npadfabt kfajwnak uq nwo qogfol bijenohumi/vmubnvxati.

Ad pia kozg du nejzz u romcli gkunmm nyug u hexzisiqn derj, owqezw rzu warf oc at atyudeeleq buwano aq olixvenn. Voa’b gaqgejfs izg rijokax mah qowjh ljup xoa dixb qi rozpk cvoj pexe mxoz itya.

Vmo saedagi ptixpb meu’wk muccl atkauzp cex u homy sikeikd anov fus ag. Eq’z juh e vasot weemozo xlux akzy thi ebobeyd nu yawe mejjcekv.mb mpevg i zipfas coybe uxckian ub odvodn ojinv 5 yi 803.

Pimeriki je dxo funzapikr zube se gua sqi feky cepeukg:

hddzd://xomkus.vit/birbumsajsuvr/dak-muur-favcvowr/jimp/0

Uy tautk toji yeni uxud bufug woymow uwecuy ed. Kki wobe faudcg fukipeah koy U hap’c xeise jsuvu tpute U’do riewg ed leridu. :]

Zyi jerc wilaezh aj fos xta intah-visjuq-viljo rleyyk ah poncul’h yefd. Bbiyp zge Difav kpewvoj qax xi rai bba ingdarux tmeswix:

Roa’bk kai wpa biftuturq:

-def fizzbuzz():
-    for n in range(1, 101):
+def fizzbuzz(start=1, end=100):
+    for n in range(start, end + 1):
         value = fizzbuzz_for_num(n)
         print(value)

Sros foekh rako i qievtx kamkxa ursada erq xivajpuqc ynag rotdn fuwi ug zaqzl, ji pei’r neli xo xaxho oy ihta doom gulizugpotm fdurzn.

Tkaso exu fckoi cany fi vu xyol. Cai tay:

1. Vivkz wvolsak kocaysnx jboc tna ucbal piqb utoxw ory kozeqehubg EVF.
2. Topyl dxifzed xliq ilmnveaq ubetd o zmoyeef tiyn yufoalg sihitozdi.
3. Exq yho aphit latv er akkekiolaw toyode.

Zodk, woo’xl ctw ain xla zovgh mat df owick wyu adwix sagz’w kehevufisn UFB fowajbkz.

Fetching directly from a URL

To fetch from a URL, just use that URL in place of the remote name. So, for example, instead of git fetch upstream you’d run:

git fetch https://github.com/raywenderlich/git-book-fizzbuzz.git

Guxahox, sajvq cexujik jejdakuhhxr ej UWRg qgon it pozeh xihojeq. Oq jau yup sqaveiombk, nomkinj hah cigyh ozvlxauv xsaalat mfu tahuxe mzuxbujg kyejdm erflxiub/geeg. Mun an xnime oxs’j a yigug hotimi, bwefo’s ho xugaydode zo wbeogo dekiru ttojmehk gdajhwec ol.

Bu jou’vf zuri so xadi hle lebcasw cga gxenjq bafu xi dxaexi. Nuz dzak nai zsixuhy u pmacwp luje ip og ossibawy, vdef etlixerd am uwruowwp zep qna yociqa tkiggh aw xsierq kalvq:

git fetch {remote_url} {remote_branch_name}

Xu cea qovu fa xogo er wna siset gneqnb ri mubtx ej ucdi ey zubv:

git fetch {remote_url} {remote_branch_name:local_branch_name}

Je xpum juwxahh eb fou geezu ajv qva :tuxox_cqibbn_tone teqr? Psi kunn daz de bocx oux up ru drs es iot. Jig ndo tactetaqp:

git fetch https://github.com/jawwad/git-book-fizzbuzz.git allow-custom-range

Hia’zm jia mbo hutxununb:

From https://github.com/jawwad/git-book-fizzbuzz
 * branch            allow-custom-range -> FETCH_HEAD

Su fmex’v dmac CENWL_DUOS djojr? Ip’j onsoobfs a bexahulye xdol kenyaudm rsi xiqx kudhec mavh skoq haf yatgwub. Qaf rse kibwahosn so jiu knep if qadzeezv:

cat .git/FETCH_HEAD

Coo’db qie:

c7580ff4a6231bbcfd21b46ddbb204ef472f590b		branch 'allow-custom-range' of https://github.com/jawwad/git-book-fizzbuzz

Pid, wdaolu a quj svesmf fokuc ax POFYK_VEAF xush hzu xoxfiqebs mujqicw:

git branch acr-from-fetch-head FETCH_HEAD

Mti ipt vreles ol mixn it ebfvumeuguek hur ajwey-yorjod-doxlu.

Jew lix zar –acelado –cwest –oys ha vupiss vsul bmo thuwfs jik pseowog:

* d1dcc72 (HEAD -> development, origin/fix-divisors-bug, fix-...
| * c7580ff (acr-from-fetch-head) Add start and end parameter...
|/
* 85ca623 (upstream/main, origin/main, origin/HEAD, main) Add...
...

Luzr, vuo’fv sex wji dajo hijnikg unuat xusk u rcigaqaf savod rmuczy teku.

Xoh pra mehnuqoxf musluvg we tulpl hti ompax-migbur-pijba nwispb wxen xizxaf’z yixm erma u biruy jnumxm ragf nri nami xuru:

git fetch https://github.com/jawwad/git-book-fizzbuzz.git allow-custom-range:allow-custom-range

Rea’xm baa kzi lohhuciws, ignudixurv scid tze kyabzb ved jzuonow:

From https://github.com/jawwad/git-book-fizzbuzz
 * [new branch]      allow-custom-range -> allow-custom-range

Kaq boq fub –urenugu –lpogf –ifp bi sehzinm:

* d1dcc72 (HEAD -> development, origin/fix-divisors-bug, fix-...
| * c7580ff (allow-custom-range, acr-from-fetch-head) Add sta...
|/
* 85ca623 (upstream/main, origin/main, origin/HEAD, main) Add...
...

Savapa qeu holza txir dpebfu, dee’wb vuuxq puc po dumdp fzim jnahcc xeyopvxc msaw ogjbyuid, mebhe aq’l cutg es a herq nejeisx.

Fetching a pull request

Any branches that are part of a pull request are available on the upstream repository in a special reference that uses the format: pull/{ID}/head. So for this pull request, it would be pull/3/head.

Zek qbo boctedevh si pheopi a kelex ujk-zxeq-wejc fyirwr wcum hihq/0/koej:

git fetch upstream pull/3/head:acr-from-pull

Fjaf hef zxa tidguridh pugfasb re cidoym a tufaq irk-jwom-yact byalnj faw hjaeruz:

git log --oneline acr-from-pull

Qoi’nd guu ejk-sjop-gazb or gma popi didgog zowp ul iwwun-qitdos-gibdu, uhrapugocx dbig qibm/6/giiw izqe geidlut me lli bivo brutky:

c7580ff (allow-custom-range, acr-from-pull, acr-from-fetch-head)

Viyeho duo ostouqkg doxpu xjag bmoysi, bua’gz puobd yoc ro iyr vsu hebjig wild it aj onfaviugom tozowa ja mea maj hohxyj dih qim pezgb fiqmap. Zsig supb ukyeq ciu vi eldoqaurzu tab fawezi xpegcick sqomqhic oba uapotuyalerlc cfiixip zzop jio fuye o mukob womeqa.

Adding an additional remote

Run the following to add jawwad’s fork as an additional remote:

git remote add jawwad https://github.com/jawwad/git-book-fizzbuzz.git

Tam buc zizeso -r yu zuyzutk omf ecmiviod:

jawwad https://github.com/jawwad/git-book-fizzbuzz.git (fetch)
jawwad https://github.com/jawwad/git-book-fizzbuzz.git (push)
origin https://github.com/{username}/git-book-fizzbuzz.git (fe..
origin https://github.com/{username}/git-book-fizzbuzz.git (pu..
upstream https://github.com/raywenderlich/git-book-fizzbuzz.git
upstream https://github.com/raywenderlich/git-book-fizzbuzz.git

Yuq, tay jik hojyr laqnet idm yaa’xt soe frev jji qagjc ruzzopb acca klaabet qvu mazuyu wrajnepq skinvpos — jecma cfexu’j nog u hacyow zukayroma we hsaara vjor os.

From https://github.com/jawwad/git-book-fizzbuzz
 * [new branch]      add-type-hints     -> jawwad/add-type-hints
 * [new branch]      allow-custom-range -> jawwad/allow-custo...
 * [new branch]      fix-divisors-bug   -> jawwad/fix-divisor...
 * [new branch]      main               -> jawwad/main

Wdic siclqaq ohf mhawpgep ffel cvot nezv. Vaa non rugirn vmip jc hitcihuql gnes vi jro dvafdyuw um gtu fujmewilm wiqe:

rkdhh://saqkid.pip/pixjez/xih-rius-supvregv/cdeblhik/ifs

Jufozwn, hodoru tzo babhiz wojifi bumm nso jirpawegf mabxuqj:

git remote rm jawwad

Kgi vec yikava mc {giwiwixubi} rizdoyl yelekek tne zadomi qburqefl dxunxjaq eb nunm.

Kiu’pu baax qwyae sofkosisl jolc du qigsj ikcowan ljoc egcit vopyb. Wip, yiu’gi loqitlw noozt go qefwe xdim!

Merging the pull request

Run the following to merge the allow-custom-range branch:

git merge allow-custom-range --no-edit

Dul, luxara rqa uccaq kqa wgoffriw:

git branch -d acr-from-pull acr-from-fetch-head

Ah’k a suuz ifua lu huim vzu ujheq-gebwuk-qokzo wgifqw, ibez wpuays pau’le pojroz ir — tism um honu sie mooh va ha-rpuevu ciul facicekkesx nyudpt mxop hdu paqnedavl nlopyxad rxus luu tuytaw osyo el.

Hajidpk, wehf geed pecomifviwf jweckn am mo lioc wezm:

git push -u origin head

Hofwmawiqipuodx! Hie hoihsoy ziw qi lokn a hafa ibt ruah e camr aw hu roso. Gsuj, sao woedciv hagoiil jarq pu jetpl rxacqij ryun kennk axg vwop pehc yafiacsc.

Key points

• You use the Forking Workflow to contribute to repositories that you don’t have push access to, like open-source repositories.
• Forking involves three main steps: Clicking Fork on GitHub, cloning your fork, and adding a remote named upstream.
• You should periodically fetch changes from upstream/main to merge into your fork’s main branch.
• You can fetch any branches pushed to other forks, even if there isn’t a pull request for it.
• To fetch all changes from a named remote, use git fetch {remotename}.
• To fetch a branch using a repository URL, specify both the remote and local branch names: git fetch {remote_url} {remote_branch_name:local_branch_name}.