I really don't understand this because this Active parameter should not be causing hardship with the compiler due to where it is located.
Mode
ObjFPC does not allow you to use the same name for a parameter of a method as for a field or property of the class it belongs to.
I could not make patch, because I am not familiar wit git. I don't know, how to create a diff file with git.
Most simple case: do your changes and do
git diff > my-patch.diff
To be sure that nothing unrelated is contained in there you can do a
git add path/to/file
for each relevant file and then do a
git diff --staged > my-patch.diff
Once you're satisfied you do a
git reset
To discard the staged changes and for each modified file you no longer need you do a
git checkout -- path/to/file
If you want to discard everything you do a
git reset --hard