On Thu, Jan 01, 2015 at 03:34:33PM -0500, Matt Lee wrote: > Thanks for the merge request. I get no notification at all that there > is one, sadly. > > If anyone has any idea how to apply merge requests from Gitorious, > please let me know. It doesn't appear to be very clear.
I rebased my commits on top of the present HEAD (06e72d302d0c). I pushed the commits to the bug-fixes-20150106 branch at https://gitorious.org/foocorp/rsd-librefm/source/bug-fixes-20150106 You can do the merge from the terminal: $ git remote add rsd https://gitorious.org/foocorp/rsd-librefm.git $ git fetch rsd bug-fixes-20150106 From https://gitorious.org/foocorp/rsd-librefm * branch bug-fixes-20150106 -> FETCH_HEAD * [new branch] bug-fixes-20150106 -> rsd/bug-fixes-20150106 $ git branch -a * master remotes/origin/HEAD -> origin/master remotes/origin/master remotes/rsd/bug-fixes-20150106 $ git checkout master $ git merge rsd/bug-fixes-20150106 Updating 06e72d3..f535770 Fast-forward nixtape/themes/2014/css/custom.css | 2 +- nixtape/themes/2014/templates/albumlist.tpl | 6 ++++-- nixtape/themes/2014/templates/language-selector.tpl | 4 +++- nixtape/themes/2014/templates/tracklist.tpl | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) -- rsiddharth <http://rsiddharth.ninth.su/contact.html>
signature.asc
Description: Digital signature
