diff --git a/content/posts/2016-10.md b/content/posts/2016-10.md index c0edfd2d1..976f51adb 100644 --- a/content/posts/2016-10.md +++ b/content/posts/2016-10.md @@ -105,8 +105,10 @@ $ ./fix-metadata-values.py -i ccafs-authors-oct-16.csv -f dc.contributor.author - Start working on DSpace 5.5 porting work again: - $ git checkout -b 5_x-55 5_x-prod - $ git rebase -i dspace-5.5 +``` +$ 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