<div dir="ltr">Also, I'll be cleaning up the old URLs and replacing "<span style="font-size:11pt;line-height:107%;font-family:"Calibri",sans-serif"><a href="http://github.com/cabforum/documents">github.com/cabforum/documents</a></span>", etc., accordingly, with the new URLs.<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, Oct 3, 2021 at 5:12 PM Ben Wilson via Infrastructure <<a href="mailto:infrastructure@cabforum.org">infrastructure@cabforum.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">



















<p class="MsoNormal" style="line-height:normal;margin:0in 0in 8pt;font-size:11pt;font-family:"Calibri",sans-serif"><span style="font-size:12pt;font-family:"Times New Roman",serif">Can we edit this part of the <a href="https://wiki.cabforum.org/github_redline_guide" target="_blank">instructions</a> accordingly?</span><b><span style="font-size:12pt;font-family:"Times New Roman",serif"><br></span></b></p><p class="MsoNormal" style="line-height:normal;margin:0in 0in 8pt;font-size:11pt;font-family:"Calibri",sans-serif"><span style="font-size:12pt;font-family:"Times New Roman",serif">Delete Steps 1-6 under</span><span style="font-size:12pt;font-family:"Times New Roman",serif"> <b>2)
Your repo is not in sync, and you can </b></span><span style="font-size:12pt;font-family:"Times New Roman",serif"><b>automatically merge</b>, </span><span style="font-size:12pt;font-family:"Times New Roman",serif">so it would read:</span><b><span style="font-size:12pt;font-family:"Times New Roman",serif"><span></span></span></b></p>

<p class="MsoNormal" style="line-height:normal;margin:0in 0in 8pt;font-size:11pt;font-family:"Calibri",sans-serif"><span style="font-size:12pt;font-family:"Times New Roman",serif">If you see a message like, “This
branch is 4 commits ahead, 10 commits behind cabforum:main”, then you need to click
on “Fetch upstream.” <br></span></p><p class="MsoNormal" style="line-height:normal;margin:0in 0in 8pt;font-size:11pt;font-family:"Calibri",sans-serif"><span style="font-size:12pt;font-family:"Times New Roman",serif"><span>I think "Fetch upstream" accomplishes these steps now, doesn't it? </span><span></span></span></p>




</div>
_______________________________________________<br>
Infrastructure mailing list<br>
<a href="mailto:Infrastructure@cabforum.org" target="_blank">Infrastructure@cabforum.org</a><br>
<a href="https://lists.cabforum.org/mailman/listinfo/infrastructure" rel="noreferrer" target="_blank">https://lists.cabforum.org/mailman/listinfo/infrastructure</a><br>
</blockquote></div>