mirror of
https://github.com/alanorth/cgspace-notes.git
synced 2025-01-27 05:49:12 +01:00
Update notes for 2018-11-08
This commit is contained in:
@ -20,8 +20,6 @@ Start working on DSpace 5.1 → 5.5 port:
|
||||
$ git checkout -b 55new 5_x-prod
|
||||
$ git reset --hard ilri/5_x-prod
|
||||
$ git rebase -i dspace-5.5
|
||||
|
||||
|
||||
" />
|
||||
<meta property="og:type" content="article" />
|
||||
<meta property="og:url" content="https://alanorth.github.io/cgspace-notes/2016-08/" /><meta property="article:published_time" content="2016-08-01T15:53:00+03:00"/>
|
||||
@ -43,10 +41,8 @@ Start working on DSpace 5.1 → 5.5 port:
|
||||
$ git checkout -b 55new 5_x-prod
|
||||
$ git reset --hard ilri/5_x-prod
|
||||
$ git rebase -i dspace-5.5
|
||||
|
||||
|
||||
"/>
|
||||
<meta name="generator" content="Hugo 0.50" />
|
||||
<meta name="generator" content="Hugo 0.51" />
|
||||
|
||||
|
||||
|
||||
@ -140,8 +136,6 @@ $ git reset --hard ilri/5_x-prod
|
||||
$ git rebase -i dspace-5.5
|
||||
</code></pre>
|
||||
|
||||
<p></p>
|
||||
|
||||
<ul>
|
||||
<li>Lots of conflicts that don’t make sense (ie, shouldn’t conflict!)</li>
|
||||
<li>This file in particular conflicts almost 10 times: <code>dspace/modules/xmlui-mirage2/src/main/webapp/themes/CGIAR/styles/_style.scss</code></li>
|
||||
|
Reference in New Issue
Block a user