Update notes for 2016-10-18

This commit is contained in:
2016-10-19 00:05:11 -07:00
parent 650a21f140
commit 4694475a28
5 changed files with 18 additions and 0 deletions

View File

@ -227,6 +227,10 @@ $ git rebase -i dspace-5.5</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>
<li><p>Merge the <code>discovery.xml</code> cleanups (<a href="https://github.com/ilri/DSpace/pull/278">#278</a>)</p></li>
<li><p>Merge some minor edits to the distribution license (<a href="https://github.com/ilri/DSpace/pull/285">#285</a>)</p></li>
</ul>

View File

@ -154,6 +154,10 @@ $ git rebase -i dspace-5.5&lt;/p&gt;&lt;/li&gt;
&lt;li&gt;&lt;p&gt;I notice this rebase gets rid of GitHub merge commits&amp;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&lt;/p&gt;&lt;/li&gt;
&lt;li&gt;&lt;p&gt;Finished up applying the 5.5 sitemap changes to all themes&lt;/p&gt;&lt;/li&gt;
&lt;li&gt;&lt;p&gt;Merge the &lt;code&gt;discovery.xml&lt;/code&gt; cleanups (&lt;a href=&#34;https://github.com/ilri/DSpace/pull/278&#34;&gt;#278&lt;/a&gt;)&lt;/p&gt;&lt;/li&gt;
&lt;li&gt;&lt;p&gt;Merge some minor edits to the distribution license (&lt;a href=&#34;https://github.com/ilri/DSpace/pull/285&#34;&gt;#285&lt;/a&gt;)&lt;/p&gt;&lt;/li&gt;
&lt;/ul&gt;
</description>
</item>

View File

@ -154,6 +154,10 @@ $ git rebase -i dspace-5.5&lt;/p&gt;&lt;/li&gt;
&lt;li&gt;&lt;p&gt;I notice this rebase gets rid of GitHub merge commits&amp;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&lt;/p&gt;&lt;/li&gt;
&lt;li&gt;&lt;p&gt;Finished up applying the 5.5 sitemap changes to all themes&lt;/p&gt;&lt;/li&gt;
&lt;li&gt;&lt;p&gt;Merge the &lt;code&gt;discovery.xml&lt;/code&gt; cleanups (&lt;a href=&#34;https://github.com/ilri/DSpace/pull/278&#34;&gt;#278&lt;/a&gt;)&lt;/p&gt;&lt;/li&gt;
&lt;li&gt;&lt;p&gt;Merge some minor edits to the distribution license (&lt;a href=&#34;https://github.com/ilri/DSpace/pull/285&#34;&gt;#285&lt;/a&gt;)&lt;/p&gt;&lt;/li&gt;
&lt;/ul&gt;
</description>
</item>

View File

@ -153,6 +153,10 @@ $ git rebase -i dspace-5.5&lt;/p&gt;&lt;/li&gt;
&lt;li&gt;&lt;p&gt;I notice this rebase gets rid of GitHub merge commits&amp;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&lt;/p&gt;&lt;/li&gt;
&lt;li&gt;&lt;p&gt;Finished up applying the 5.5 sitemap changes to all themes&lt;/p&gt;&lt;/li&gt;
&lt;li&gt;&lt;p&gt;Merge the &lt;code&gt;discovery.xml&lt;/code&gt; cleanups (&lt;a href=&#34;https://github.com/ilri/DSpace/pull/278&#34;&gt;#278&lt;/a&gt;)&lt;/p&gt;&lt;/li&gt;
&lt;li&gt;&lt;p&gt;Merge some minor edits to the distribution license (&lt;a href=&#34;https://github.com/ilri/DSpace/pull/285&#34;&gt;#285&lt;/a&gt;)&lt;/p&gt;&lt;/li&gt;
&lt;/ul&gt;
</description>
</item>