2

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?

Jonathan Allard
  • 18,429
  • 11
  • 54
  • 75

2 Answers2

2

Something you might be able to try is to clone the (full) repo to a different directory on your computer (eg ~/github/geany-on-rails), have a symlink inside your ~/.config directory so ~/.config/geany points to ~/github/geany-on-rails/geany and drop your modifications into that directory.

Cebjyre
  • 6,552
  • 3
  • 32
  • 57
0

I can't seem to find the comment option for your question to paste the following; but is this relevant to what you're looking for?

How do I clone into a non-empty directory?

Community
  • 1
  • 1
HaaR
  • 1,383
  • 2
  • 13
  • 21