Updating FPP within DarkRP

This is a wiki page for the main developer of DarkRP. He will keep FPP up to date.

First add the remote

git remote add -f FPP [email protected]:FPtje/Falcos-Prop-protection.git

The following command often fails:

git pull -s subtree FPP master --squash

The reason of the failure is that git has some trouble knowing where exactly the FPP folder is located. It tries to go back in history, but somehow it comes up with the most random places for subtree merges. The issue is described here: http://stackoverflow.com/questions/1306595/git-confused-when-merging-an-update-into-my-subtree

Therefore, the following set of commands will work, and they will work properly.

git fetch FPP master
git rm gamemode/modules/fpp/pp/* -r
git read-tree --prefix=gamemode/modules/fpp/pp -u FPP/master:lua/fpp

Git is clever enough to recognize the changed files. The effect is similar to a git merge with squash, except you'll have to enter your own commit message.