From a33688aecfa2c849d7425cb1e084304933495ee6 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 13 Jun 2019 10:23:44 -0500 Subject: [PATCH] Add Images folder in Technotes and updated Technotes/README to point to a couple more files --- README.md | 2 +- Technotes/BranchingStrategy.md | 4 ++-- Technotes/{ => Images}/Branching-Full.png | Bin Technotes/{ => Images}/Branching.png | Bin Technotes/Images/icon.png | Bin 0 -> 7895 bytes Technotes/README.md | 2 ++ 6 files changed, 5 insertions(+), 3 deletions(-) rename Technotes/{ => Images}/Branching-Full.png (100%) rename Technotes/{ => Images}/Branching.png (100%) create mode 100644 Technotes/Images/icon.png diff --git a/README.md b/README.md index 58d23fecf..c09420d85 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# NetNewsWire +# ![Icon](Technotes/Images/icon.png) NetNewsWire It’s a free and open source feed reader for macOS. diff --git a/Technotes/BranchingStrategy.md b/Technotes/BranchingStrategy.md index cf9732d4d..768e9ab48 100644 --- a/Technotes/BranchingStrategy.md +++ b/Technotes/BranchingStrategy.md @@ -7,13 +7,13 @@ The main repository for NetNewsWire utilizes a [Trunk Based Development](https:/ Three-Flow uses 3 branches to facilitate development, stabilize a release, and manage production hotfixes. Development happens on Master and moves to a branch called Candidate when it is ready to be stabilized. New feature development continues on Master and bug fixes to the release candidate happen on Candidate. When the product is released, it is pushed to the Release branch. Hotfixes can happen on the Release branch. Candidate is now free to be reused to stabilize the next release. All bugs found and fixed are back merged to Candidate and then Master respectively. -![Branching](Branching.png) +![Branching](Images/Branching.png) All arrows going up are promotions (pushes) to the next environment. All arrows going down are back ports of bugfixes. That is Three-Flow applied to NetNewsWire. It would be that simple, but we have two products we are going to deliver from the same repository. The iOS and the macOS variants of NetNewsWire. To stabilize and manage both variants, each will need to be given their own Candidate and Release branches. -![Branching Full](Branching-Full.png) +![Branching Full](Images/Branching-Full.png) Today (6/12/2019) we have 2 branches, master and macOS Candidate, in the main repository which will eventually grow to be 5 branches. diff --git a/Technotes/Branching-Full.png b/Technotes/Images/Branching-Full.png similarity index 100% rename from Technotes/Branching-Full.png rename to Technotes/Images/Branching-Full.png diff --git a/Technotes/Branching.png b/Technotes/Images/Branching.png similarity index 100% rename from Technotes/Branching.png rename to Technotes/Images/Branching.png diff --git a/Technotes/Images/icon.png b/Technotes/Images/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..affdc72fcb3d62a013f5c2782f10742c591e7f32 GIT binary patch literal 7895 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

$)*D5GgHelFIr^Xgd*cFOlLK03 zxlDhbka;}P*mphG|I%4W`FzPa1_EtWe1*||jMbt_i$f57XFe6{frW2Qzlm6#j$+Q9 z8Sf~|DutVp$;7ZHDRG;2p?UlG=+@c3+=Hcs6TdDwK)O`1YOxPfpvo#KG7{x`$r5ug z$kXv>41Z}!^bsf=OY2|Pdt8|%joE4RS2wwH_b5Mv(5|sPIRk9%bpsTq!xKPf-YX&0 zLISp}QLT?syG<`ff|__Pu*k0G$21JEd`59@_PNkMwX5!=6mvw;8p_KUq9V`0(zwM< zX3Wy>-r|ohG&(xkez_^>dAn74U)cT@+{E>N7;>!tyuCZ5U$!8w(1|xrX&rb@C9ygk z+k}agH18Et8bO#@p5hV8lRE}|&0H1fsz9)?xM=C)u$!=m{nmhc{#-~y@lcfT)*AJXZtlHZO%C7CV^r? zyT=+Aj>wNhC-#=8nRqI_6lOG<6Odl1$Cd*0Ax7N7D9gUVnNn9LzOwyEso)rcxW?5v zq)qv^v%i$$GI>vDd;*sz7xHUupN{%slqGR~o`j&A+Aq?P;jT3uNkz>j?|8}3l^YbR z?Ht9bdMSaK`Xn(diZ8O1Dc$;)SyYDxZ*6xZdi?NC&xEUBXxCHQyNp|U&6>7xSMbu#!0#Yz# zAz{PW(9iDOhwaJBNyC;U)2vo?N~}qF<>h$F9eCeH)`nD{%c7CxUgQ@>HQ%U{P5tov zw6JMare$ATycMzg(*xSty~`IGwI#U`=jPcOz?=y7ix&R(-JvtBtf|B0#6z?J}fI+NQ#|L!p z;?j6M2q+cIhoCbV(~cg06Z<+tMT7I(vo1Ym+!z=byL)>%>YST%^*kt(J$%a2>(CtM z6vGTL`-Qfz`D|B&(fK-_8@XW9<1DniIG0^&MEJ|je(j!&0$^6AsyIz3Kn^Zq`=!1VxV((KDL)=I&c zeKRX*&vh&Dn?F1MM8CdglHp0sQ)3=mT6)h&)agR?d|02=OqphVezA<_%JY6c(7|1I z?UY|ZYONX#MQ2e+Wt`N|FH;8ut_H*fobrt2`p0huiN_n4iBRNp{^_@0o6+@HyBF*Z zvLPHeHfF;VVHF3cE3shNf~W8?ItW6PfTFWjCW~iawU9S9yopvenG?9k4=XdZng>ZV zn(x3QvFvBvPr@;sol>riR0vZwZEbmWl5RJ#XKGw0s>09b`Heg^J4+n>sqvChbwg>8 zE4j@4cUgG4_`W_^9B*G7s7K6b6;y}W

`9x;jZZXY(aM;!r_t=~u+$q5unu`|3!1 zwsuz$7V7@p> zW;U;bI%QMEW)o+#$1%;&vGQ;pRB#}XMPtCKhEG6%$7O>tM%Vd`huF$sU%BD^*0|P^ zrwRe#Uzgp7wh~1P3E(_e$6B`%B^#IY5uJqz->k&Ek{@c@<8g*;RE?{X9#x(Ryt(L+ zm)1tlMsKE71^_n$$F%1Xp9A_APp@tH=0{ENMS=8KuUyoarvd=4{E!k#t-hYW$>89g zO_!Q^_UEg^e&J`hR_VuTr(VfsNEeq*C_D-j$QxI3hb$W*UJws?0oeOD+W;0*o3>zZP z93_zf$)4H(gFO8tALAw*F>F5|cr@rI!jR{HgzjDd3btEo5&1T`_$51Amp9NXXF#8F zWuqw9s>WR#z znWla71gD`|oGP{yXh7L`T_fG<#IRZ-pnPi|hI&>|XJKOMy5uUo#X1X#LsQ^`P=cL` zZ?dq57%nHG>#XEkAco_w9~##Q8XN9bwnYxeFW{0J3Ufd)0qCZ$6J@Rq}k64dO1(RV;|_A!ey)J`@^wFN-G4 zIxT<;#=udb>3#cJBH+WdSTx?Fd9HlG2h3j5P$ih>7-dUJb0!;)Q`6|3ys$~;j~~G| ztaE3Ho0se_^ILe}1sWIoM|SoZ;~y90@{>M0Sim|d?j%)p$*4hDLwCd{YEHg*O!R<|81~|FeBuod2)Bb>KBcHZ3c01 z#GHu3cY!rOve$i?MT=5AKD>oLms(7 zR483?a#k8)m^WSk7DDJSDnD1Un_drWmVP#bB-8m!~wBtV52?w_=WC&bLF4iF2q@E*xD-0 zIer5cqPaa5j{UVz#px_T+w8%VC0?DtrF;!VmDnMulU^=2aR}%P&0au>GtWN3IoP#n zvR&G`xdIk&85}RmSs=6{SZnO&1sc5u-&m)iEialbeg{{C9uS(qwU&BMh#7)!tGc(w zb!qh2swlo96u>pQWV~1t3{z-{M>k^M(`X6(7Y$tJshxP%@3~t(_>=J&6Z=M#os%21 zZjq(cI^6IS>IY>Z(+uZfw(bFc+c-6StfyyhJ?nUG)L3!hitEVW}uj*_NGj^CZt zwI}x;ew~D(xQdM}V^w>j!ySwK6PcuHZ7d}0JT5j7n_zr4fHVqduOylhUj~}D;Dp#l zPF)kLgU0wjUoMO^u6dCx!I(ZTWv#My#&ZDD%Au|H=Q`184ZltD!Fu4TG(6v# zM4AvPT|!41QQhZY-fFE;%U+#gD{GCB$blYT!Lp6M|FSNXLWauvAS4$Ye)`@gb6|;o zscOpyWz#?&VoqJA+b^z?ZTryD>Pv3_h>|2vn2 zFdG-Q;cB!E|ATLgGq!g#7Sj)~iWIacj{*uwlSc4>@r#@9-i_^i4ett^YLr8e0G6}T za1luecyP&VhMHmeBFVAE#4D1@w#KZ<{$n#U&+qYVKt>fc3qAdp%&7nPEH0IcBS(9*Nd8vW7F`YoMNPj&S+Q923S>!J>(F5uDT$S>x*g)e?2PEr(5>} za;4iEUqIry?`_1WMEfn`ZS#ZEih$rnW&s-kN)Gmm0Hfn^-gdTG_NGAfeDD~*!VJr{ zv}ryb9WW|jXvCJu3{8@N8S>+i5X8LAzfORMIei?LlJ*5lo-Pe;L1M--CT+hvlj3{P zv7%4%#hRNqIq*o*>o3Y50qKTt9G~rs#(!4$)qe9&b70Uh2?oKHI|m;{(LXZG33{<= ze$RQ@c2P6E#gk@CYUZ6OOH-gX=5$yC1&O*Xm)}>XUE4GG>R4&2tOKiZ_mk0#g7#>e zLRZ2KhpHFS(3L<%h#+xMyTy034677rj+EA#b21pvzq2ypKJ@#>c^R?|$UN{F0YYOQ zFMVbMOzj#Zifp8_MjYmCR|Jk03?nO=o0Mti^j38$?Hl$xv&)&7PF_{slyJe`5+TxF zjRg&1l9_5bU?Y4BDLyWk!0D!$2YWtx4m;hKU5$9HcCs9!U7`Z}e|tSe)80?<)?Qi8 za(y}{tqOYG>OQ3Vbb%H+_n6~meq4ldTz}7~s4+z>X(NNHfLgqU>69k6k%)u*%U(|- zWBf~{dJEZ^Yvx}bz1lHxl{A&aJI^h7R2AluWxD;HT^_@0s13az@&J4#Z`{H z4{ON7^10()qJGv2W3$onF|V#v$STj!!TZFd*^v)4((dyM}{4Pg5h z3_;vs`OR^s->e^3qNtgVk$?8j{N?nUTL z**LVtl)Gn(Zb#