From 85293f0135754b37fcdd4165ddb6afe9a80beac2 Mon Sep 17 00:00:00 2001 From: hubwriter Date: Wed, 10 Nov 2021 16:38:26 +0000 Subject: [PATCH] Update master to main (#22718) --- .../help/branches/pr-retargeting-diagram1.png | Bin 5005 -> 7729 bytes .../help/branches/pr-retargeting-diagram2.png | Bin 5193 -> 8290 bytes .../about-branches.md | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/images/help/branches/pr-retargeting-diagram1.png b/assets/images/help/branches/pr-retargeting-diagram1.png index abec87c5d75e97cb754dbe68b97924407a4111ff..5241f85934522c271077522f51c9dd6f8785ae5f 100644 GIT binary patch literal 7729 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 GzWZMbL}sf1 literal 5005 zcmb7|cUTi&m&Zd3HPQrx&>~W#2&jZ2QUXXvAb|8DAQ+4gq$nUFO+iEXDMjfZJ#-?{ z0@9llr3R&g^xo?Zy6^70yMOJ>JbCV%d*{xX%$f7~o*SmGrw*avpaFqE5KRqLLlB6R z324VskpjQule_dF5VMh{s!N8{9nY& zi+jx{;YwdD_so19lTNtW3%mU1M%_!F{OM^}W5;+(?B(=cC;f3JMB@nubPOo^ie#YN*ia;NW0kVSzv(oE+_~5%D4y z>akGi_aZw!C++V9f&OZTcBbRlh6V)rKtV@Wmj?!e@$hK65yG!T1?vyZ&UQ+Gqg$}h zp_*q~6=Od6YHwJrsyt+$AA01Q6eRnuR$fJB_2(j6$HuJ3V&mh7%O4_t-gk1^Yk|7n zbnZ>{UK``U-jQ8eS+S~k{3{okeLBr^R-aK*Qrre z*J4>9y{6#1i!)RcuXCT(nw7bA3mPGLQ)Bk`Z%U`&kdUhbYlNc(4OGTxeNY>bYcsi!>+r$(ENmcCzvl9{v!ply{$L zo0zaIFmcg<#%q1GifW=1uJT@scv7C%+I}UA8Fbz>oPELsrFg(dMtE!uJ4dicSYPY{@d$0b?HG;-B)-&J1a^TZN z6Qo_?R?zu4v20tD#;vaDFK-Qxn@Z9;O@Zxn{2`x&1cUJxW$WHA82emE`+49NSX4|l zzJhXmLVf?#4!qhB5>ygg;YiW~PS^UP*$lWY2ci=r{b-m$_LU(vBBJF=usM{e3u~XJ zBHQxa`Wa5bXWLoF)t0wYt~~lfQ4FMU!v@0&Y$!e8$Bu{&e|K$Dt>aXgUi4QlNicz$TA=b4%c6Az+CT7>gt5uC< zH9}m-VZo*pa6>Y8-_MELEn0$}L0qJxg2(D)9pJ*qK$YK3pn`;P-nB11CA3xF{#|{n3IoRw&VHNxh)KEShH4<`BfOF=d zOHlvVfM;+nIJ}*jG7V0JSB^);C%ZAAg7l$)mH7e!4K(6EqKuNSZEZH;cu%SoCeQ<;Z%PnJvaTGlgRtuRx~gpU_CeS_Ji@t zz}^20%uiQEe!8gKhWr8UTk3RH$z}^aA8CKnhVv>uIA&;fK^7MKZDYDMWTdINdD0;6nibRCcp$HOto}S0F0tSG-6LIy zeY3YYz*B78`n`#HqTjW$AWqHXnBz6C9yRbM-+9RS@2NB_U62pa{GaK&+?x`AKX;=!du9T`>}3VcPT>S%^H zy#QSV=fJ%~dy4}u%flt}ct%zFG2j!Ulh#d^ue56n1#<7!-dbeioRa*K1JlK8oM4@-Z0n$%K27>IRof6kCI#W=20 z6{gpBf5qxQ^xMwH^n**@E9Y%*du;Cr-c2^j+h-k5Q+Xvl?pKzRqru+bbF@+cm45uT zQ=dXTk~=29;3mhniLXJF5Do{2sE&*1iNadnJsN#uXkHp*-31ZtLr>XpW2>RnHQWMv zJU?IOp3W0za_dZK^>WIHvvSi$g=dOTAE02HjTO@`(b9QPs zg&&suF(VBw%80T*J3Yy1X=&-8?M{@nci1F*Q$+lXcFBS-udFx@JcZ_EL)`fDij#C` zlXVVe5TW`n^A1I6wPT3;H?NRobIS`~W%E83rr5xdis9|T^r5{0*9TxFWo0T3ov~tz zX4}t?cI^UOfY9Jmk9agzQ~7~7T;>#s<8W2M<4KrGwZ?x&ug}N@y7L+2eDoKm#Yev{ zDDiyL5+yKrbamsDyKgo7$Ju1cYxe8e&#$t|X{hBuL?5Xs64FIQ?iJQ}uO+)HYiMX> z+`&fK=_J6vef^sD;_Ork2bo4os6c7hR_7q=Z-M8`)`#k{sd-r+fF3*JZ*DHH$g{V$ zp~fM7ukAIxm8r9v#8^=F(=FIxIs-$)%XGbf(f~dvHa0d9V?{;9X`*>jUPO_(SQwlDAGeyLgQMf*awr7q;IR6$(hxel`l?J>Ss6iLqGT6iq@@*ZsH>;f zawsxQj6zG?gFdLgx{*zv-K3nkk)}|hp{|AZK{Ya^!RzBC?Ta5#Cy1?%)k4|X4+iep z*uj{C(-NCG%xY?Bp7akD*|ZwLS7V613m&FYZ$=^j{&p<5h~^a7)G6F4FP7z#k=bu% zvuP4*!5cV2(=#$&oHCPdm|vW|gkYL$r1*l5>I%HMGzfNQob^lu7^j4GaBxWFX(cGK zw|93Z%RUhhkYJ#kCzPnEL}=L^aeqegMsSkmyGlxql{#ua6DRLYRVGVB4;3cSam%=+ z0^*Nq>O*|R`sSu#kJrRuKmf>0Did|7-giV zJFtnne$9BlKqId|5|tK!p4_)0z2q81Vf#{?4F;P$T5m;)2e0L45{3Ha@p3T9i|WQ1 zWdX{<2z1oP=P_xAjmI9=0P*dAEiCkc{iovBKIL%$+&JBF&*Biu65#a1$eq*Zs}WiA zb})dQb6)+y-8rg&GbDtW`NALa5pDAfJRAPzex}`Z@-BnNTAapB6aZDz;ICny;BGqq zg4G|^{ZE9Ug8onjVB^0L5itE>-5+b;Ldap{AvNF}aPZCVAWnwtwDCU5$@2Mk37Hqq zZ;awvNnF!Lt7gVgApnTJX1sH957*yv>QYDB;Qf~Q{5l-1{}o@MYOAn7eW(=RTMM8< z0KGpB$S=pv*f3&{Nj^(xB{x#YH|H##?JGtYmGJ;z?H9~+C>D#&$gtPfkBW?pEPhHj z*&PjI7F0M|F56ieS{uk8Vzcps(e?K5nR^+ofd&3L8Xs9v;SJ=67}wRgsE;4R{btV* zsQFJ~qGh&T5>QyIjn|#+Z%i`_=mczC;8742o?gdtdMbJ@R#@6`_lHhA;6UVHo8PeQ zt^Trz*R{0d^jX)AyA~!02%h#H#WP%?*V-7@rbM}~eUso>@}*W{UVLjN@N9sT7~m5T z=^PsJ22?9h5Y&?>wWLznE)5pw>FHf6tMXim73!o{JTCS>Ih1`ehqJCVpJNr&OEkr! zSjr`RcOS_+ZOwhtI^LY^9IbF=6K-f|_>3ME$mizfo}8QngnFaU$VVv`8X6h~Tqy+g zpeuf(L!^j`?5D2q<8oevmvQZ{bmWtp4UclLEb2c5&|&Hy2)8iP&2Q5UYni+iHr4$$ z2lp$y1@@DB+C&Bopo3&-a3&@upn{@wvQ4&KPEl1=O{H`l#Ic7aNHFvl+co;^EFK&k zby_4QB}v}7`DnPwoL&^81Um#N^}%VHrS0 z0TSxHJ@(Fxr|T2SL11?FPuJC;UtHG4YDwbgF=zBDeW@Wi#Ws<8pQxfk>g zw}LR^10}S~vaU&l;;}q?_SAK)&gK|j1)1zgB%iI9&8XUby(pg@ZO^R2O!C$hJ-FTE_r`Yye-<+>ZXNH zg)2bX>vJi4-A2Al-@E$SiN!e=k{<#f4J0>DZ!|nI0xJcIrf0Vg=K-ia^YOW6L-3nv zi~g1%Esccw?k-0gBZ<5lTU+lsbMnZGGR>jK8ibsV?S}i7P|Xnzi;8(bC`ifGGObm^ zh$kM0ipR_wuA>iaXee`W>>4uZLad9k5BVlNfAsAWd-PPgx~4n>>69Wo zrJ(v>)U&IB7#J7~{}@YGqm^I5(L59|oHnw6wyC*wZdk~gWS*BGUHo*HB$Q0b%F3L& z6T_(K5)_s9uwoqUMl_>)#Yv=?83xnmZ^AGhQ=8UQz~TW|=6q3tUEXa1B>4nnpTGX8Nmj)!C=LTKB0 z&3tAi6^u~~i%EaWS-E#BIk3P*)o@rLKxIL#pa#ECFTm0UKHv98K_h?nD2M}@g9=;; z4vK<+9LNCU-{${313Lb#?@#l;M*geg|4c!(NFP2vYEn@JcmdK>(^D-(*arRwypMth diff --git a/assets/images/help/branches/pr-retargeting-diagram2.png b/assets/images/help/branches/pr-retargeting-diagram2.png index 67805d50001bc4156ec1f2f1d10cce711284007d..81a3ea13ee5f90c2d55749fbb72c32194b181cf7 100644 GIT binary patch literal 8290 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 UV7|Gr^IrhxHT6+B>b5uj7jL153IG5A literal 5193 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 diff --git a/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches.md index 5f26926286..b14dec6166 100644 --- a/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches.md +++ b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches.md @@ -44,15 +44,15 @@ After a pull request has been merged, or closed, you can delete the head branch {% data reusables.pull_requests.retargeted-on-branch-deletion %} The following diagrams illustrate this. - Here someone has created a branch called `feature1` from the `master` branch, and you've then created a branch called `feature2` from `feature1`. There are open pull requests for both branches. The arrows indicate the current base branch for each pull request. At this point, `feature1` is the base branch for `feature2`. If the pull request for `feature2` is merged now, the `feature2` branch will be merged into `feature1`. + Here someone has created a branch called `feature1` from the `main` branch, and you've then created a branch called `feature2` from `feature1`. There are open pull requests for both branches. The arrows indicate the current base branch for each pull request. At this point, `feature1` is the base branch for `feature2`. If the pull request for `feature2` is merged now, the `feature2` branch will be merged into `feature1`. ![merge-pull-request-button](/assets/images/help/branches/pr-retargeting-diagram1.png) -In the next diagram, someone has merged the pull request for `feature1` into the `master` branch, and they have deleted the `feature1` branch. As a result, {% data variables.product.prodname_dotcom %} has automatically retargeted the pull request for `feature2` so that its base branch is now `master`. +In the next diagram, someone has merged the pull request for `feature1` into the `main` branch, and they have deleted the `feature1` branch. As a result, {% data variables.product.prodname_dotcom %} has automatically retargeted the pull request for `feature2` so that its base branch is now `main`. ![merge-pull-request-button](/assets/images/help/branches/pr-retargeting-diagram2.png) -Now when you merge the `feature2` pull request, it'll be merged into the `master` branch. +Now when you merge the `feature2` pull request, it'll be merged into the `main` branch. ## Working with protected branches