I'm trying to install a Rails plugin for Geany, which is files on github. The repository has a directory /geany
which I have to merge with my own ~/.config/geany
. Now I could just copy the files manually, but I want to retain the link so I can update. I had a look at both git clone
and git merge
, but I don't really know what to do with them.
How do I "merge" the two directories?
(Edit) Where I want to merge the files, on my computer, isn't currently a git repo. It's just files that the text editor geany
will use.
The difficulty seems to be in the fact that it's not /
that I want to merge, but the (contents of) /geany/
folder.
Also, how will I update my files using git?