<div dir="ltr">All,<div><br></div><div>The planned changes to the global-workflow repo on VLab have been completed. The HEAD of the global-workflow repository is now the "develop" branch. The "master" branch still exists but the HEAD no longer points to it. The develop branch contains the history of the master branch and commits to the HEAD of the repo will now be done on the develop branch. We will keep the master branch around for a while, at least until we move to GitHub.</div><div><br></div><div>Additionally the new "operations" branch has been established and has the same permissions as "develop". Anyone wishing to push changes to the operations branch will proceed similarly to how changes are pushed to the develop branch (via Gerrit code-review while we're still on VLab).</div><div><br></div><div>Users who make fresh clones of the global-workflow repo will now see the "develop" branch as the default instead of "master":</div><div><br></div><blockquote style="margin:0 0 0 40px;border:none;padding:0px"><div>[Kate.Friedman@m71a3 global-workflow]$ git clone gerrit:global-workflow ./test</div><div>Cloning into './test'...</div><div>remote: Counting objects: 2749, done</div><div>remote: Finding sources: 100% (37082/37082)</div><div>remote: Total 37082 (delta 24780), reused 37066 (delta 24780)</div><div>Receiving objects: 100% (37082/37082), 129.63 MiB | 22.99 MiB/s, done.</div><div>Resolving deltas: 100% (24780/24780), done.</div><div>[Kate.Friedman@m71a3 global-workflow]$ cd test</div><div>[Kate.Friedman@m71a3 test]$ git branch</div><div><b>* develop</b></div><div>[Kate.Friedman@m71a3 test]$</div></blockquote><div><br></div><div>Those of you who do a "git pull" in an existing branch will see the develop branch listed as a new addition:</div><div><br></div><blockquote style="margin:0 0 0 40px;border:none;padding:0px"><div>[Kate.Friedman@m71a3 global-workflow]$ git pull</div><div>remote: Counting objects: 2739, done</div><div>remote: Finding sources: 100% (50/50)</div><div>remote: Total 50 (delta 36), reused 50 (delta 36)</div><div>Unpacking objects: 100% (50/50), done.</div><div>From gerrit:global-workflow</div><div><b> * [new branch] develop -> origin/develop</b></div></blockquote><div><br></div><div>Users wishing to have a copy of the develop branch in clones made before today will need to check it out like any other branch:</div><div><br></div><blockquote style="margin:0 0 0 40px;border:none;padding:0px"><div>> git checkout develop</div></blockquote><div><br></div><div>That should be it though! No other steps needed on your part! Please let me know if you encounter any issues that you feel may be related to this change. Thank you to the VLab admins for assisting with this!<br><div><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><font color="#000000"><br></font></div><div dir="ltr"><font color="#000000">Kate Friedman<br>NOAA/NWS/NCEP/EMC Engineering and Implementation Branch</font><br></div></div></div></div></div></div></div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Jul 10, 2019 at 12:25 PM Kate Friedman - NOAA Federal <<a href="mailto:Kate.Friedman@noaa.gov">Kate.Friedman@noaa.gov</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">All,<div><br></div><div><b>To follow the recent adoption of GitFlow procedures at EMC for our code management the global-workflow master will be renamed to "develop".</b> Additionally, a release branch called "operations" will be established and will have similar permissions as master/develop, meaning commits to it will be controlled by the global-workflow code managers. The operations branch will be used to prepare releases for hand-off to NCO, whereas the develop branch will continue to be used as the master branch has been.</div><div><br></div><div>In preparing for this change a test repo was set up by the VLab admins and the master-to-develop name change was tested there. Results from those tests show that this change should not cause conflicts with your established branches/clones and should be relatively seamless. If you would like further details on how this change is accomplished let me know!</div><div><br></div><div><b>So what does this change mean to you?</b> It means:</div><div><ol><li>When you make a new clone of global-workflow you will get the "develop" branch as your default now instead of "master". Proceed as you normally would from there.</li><li>You will sync your branches with the "develop" branch instead of the "master" branch (git merge origin/develop).</li><li>Users will want to do a "git fetch" in their existing clones to ingest the change (one time thing after rename is completed). You can also do a "git pull" but only if you don't have uncommitted changes in your local clone. A "git fetch" will pull down updated information from VLab but won't integrate changes into your current branch.</li><li>Pushes to the HEAD of the repo (i.e. currently "master") for review/commit will go to the develop branch instead of the master branch (mostly for code managers knowledge).</li><li>Learning to say "develop" instead of "master". (<sarcasm>HARDEST part of this! I won't lie to you, this bit may take a while, especially if you're still saying "trunk".</sarcasm>)</li></ol></div><div><b>It is the intention of the global-workflow code managers to make these changes within the next week.</b> There is one commit currently in review that I'd like to complete before making the change. I will let you all know when the changes are done or if we decide to delay the change a bit more.</div><div><br></div><div>FYI, when we move the global-workflow repo to GitHub it will start with the develop branch as the default/HEAD branch so you should be used to it by then!</div><div><br></div><div>Let me know of any questions or concerns you may have about this change! Thanks all!</div><div><div><div dir="ltr" class="gmail-m_3303492590895014773m_-4231980924816085100gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><font color="#000000"><br></font></div><div dir="ltr"><font color="#000000">Kate Friedman<br>NOAA/NWS/NCEP/EMC Engineering and Implementation Branch</font><br></div></div></div></div></div></div></div></div></div>
</blockquote></div>