Add notes for 2016-10-18

content/post/2016-10.md

@@ -98,3 +98,15 @@ $ ./fix-metadata-values.py -i ccafs-authors-oct-16.csv -f dc.contributor.author
 ```
 
 - One observation is that there are still some old versions of names in the author lookup because authors appear in other communities (as we only corrected authors from CCAFS for this round)
+
+## 2016-10-18
+
+- Start working on DSpace 5.5 porting work again:
+    
+    $ git checkout -b 5_x-55 5_x-prod
+    $ git rebase -i dspace-5.5
+
+- Have to fix about ten merge conflicts, mostly in the SCSS for the CGIAR theme
+- Skip 1e34751b8cf17021f45d4cf2b9a5800c93fb4cb2 in lieu of upstream's 55e623d1c2b8b7b1fa45db6728e172e06bfa8598 (fixes X-Forwarded-For header) because I had made the same fix myself and it's better to use the upstream one
+- I notice this rebase gets rid of GitHub merge commits... which actually might be fine because merges are fucking annoying to deal with when remote people merge without pulling and rebasing their branch first
+- Finished up applying the 5.5 sitemap changes to all themes

public/2016-10/index.html

@@ -212,6 +212,23 @@ DELETE 11
 <li>One observation is that there are still some old versions of names in the author lookup because authors appear in other communities (as we only corrected authors from CCAFS for this round)</li>
 </ul>
 
+<h2 id="2016-10-18">2016-10-18</h2>
+
+<ul>
+<li><p>Start working on DSpace 5.5 porting work again:</p>
+
+<p>$ git checkout -b 5_x-55 5_x-prod
+$ git rebase -i dspace-5.5</p></li>
+
+<li><p>Have to fix about ten merge conflicts, mostly in the SCSS for the CGIAR theme</p></li>
+
+<li><p>Skip 1e34751b8cf17021f45d4cf2b9a5800c93fb4cb2 in lieu of upstream&rsquo;s 55e623d1c2b8b7b1fa45db6728e172e06bfa8598 (fixes X-Forwarded-For header) because I had made the same fix myself and it&rsquo;s better to use the upstream one</p></li>
+
+<li><p>I notice this rebase gets rid of GitHub merge commits&hellip; which actually might be fine because merges are fucking annoying to deal with when remote people merge without pulling and rebasing their branch first</p></li>
+
+<li><p>Finished up applying the 5.5 sitemap changes to all themes</p></li>
+</ul>
+
 
         
         

public/index.xml

@@ -138,6 +138,23 @@ DELETE 11
 <ul>
 <li>One observation is that there are still some old versions of names in the author lookup because authors appear in other communities (as we only corrected authors from CCAFS for this round)</li>
 </ul>
+
+<h2 id="2016-10-18">2016-10-18</h2>
+
+<ul>
+<li><p>Start working on DSpace 5.5 porting work again:</p>
+
+<p>$ git checkout -b 5_x-55 5_x-prod
+$ git rebase -i dspace-5.5</p></li>
+
+<li><p>Have to fix about ten merge conflicts, mostly in the SCSS for the CGIAR theme</p></li>
+
+<li><p>Skip 1e34751b8cf17021f45d4cf2b9a5800c93fb4cb2 in lieu of upstream’s 55e623d1c2b8b7b1fa45db6728e172e06bfa8598 (fixes X-Forwarded-For header) because I had made the same fix myself and it’s better to use the upstream one</p></li>
+
+<li><p>I notice this rebase gets rid of GitHub merge commits… which actually might be fine because merges are fucking annoying to deal with when remote people merge without pulling and rebasing their branch first</p></li>
+
+<li><p>Finished up applying the 5.5 sitemap changes to all themes</p></li>
+</ul>
 </description>
     </item>
     

public/post/index.xml

@@ -138,6 +138,23 @@ DELETE 11
 <ul>
 <li>One observation is that there are still some old versions of names in the author lookup because authors appear in other communities (as we only corrected authors from CCAFS for this round)</li>
 </ul>
+
+<h2 id="2016-10-18">2016-10-18</h2>
+
+<ul>
+<li><p>Start working on DSpace 5.5 porting work again:</p>
+
+<p>$ git checkout -b 5_x-55 5_x-prod
+$ git rebase -i dspace-5.5</p></li>
+
+<li><p>Have to fix about ten merge conflicts, mostly in the SCSS for the CGIAR theme</p></li>
+
+<li><p>Skip 1e34751b8cf17021f45d4cf2b9a5800c93fb4cb2 in lieu of upstream’s 55e623d1c2b8b7b1fa45db6728e172e06bfa8598 (fixes X-Forwarded-For header) because I had made the same fix myself and it’s better to use the upstream one</p></li>
+
+<li><p>I notice this rebase gets rid of GitHub merge commits… which actually might be fine because merges are fucking annoying to deal with when remote people merge without pulling and rebasing their branch first</p></li>
+
+<li><p>Finished up applying the 5.5 sitemap changes to all themes</p></li>
+</ul>
 </description>
     </item>
     

public/tags/notes/index.xml

@@ -137,6 +137,23 @@ DELETE 11
 <ul>
 <li>One observation is that there are still some old versions of names in the author lookup because authors appear in other communities (as we only corrected authors from CCAFS for this round)</li>
 </ul>
+
+<h2 id="2016-10-18">2016-10-18</h2>
+
+<ul>
+<li><p>Start working on DSpace 5.5 porting work again:</p>
+
+<p>$ git checkout -b 5_x-55 5_x-prod
+$ git rebase -i dspace-5.5</p></li>
+
+<li><p>Have to fix about ten merge conflicts, mostly in the SCSS for the CGIAR theme</p></li>
+
+<li><p>Skip 1e34751b8cf17021f45d4cf2b9a5800c93fb4cb2 in lieu of upstream’s 55e623d1c2b8b7b1fa45db6728e172e06bfa8598 (fixes X-Forwarded-For header) because I had made the same fix myself and it’s better to use the upstream one</p></li>
+
+<li><p>I notice this rebase gets rid of GitHub merge commits… which actually might be fine because merges are fucking annoying to deal with when remote people merge without pulling and rebasing their branch first</p></li>
+
+<li><p>Finished up applying the 5.5 sitemap changes to all themes</p></li>
+</ul>
 </description>
     </item>