Tweaking upgrading best practice ?

[AbsolutelyFreeWeb]

Hi,

I'd like to upgrade my 1.2.8 to 1.2.15 and was wondering what I should do to find all my tweaks.
My plan now is to run windiff on all files and see what has changed and re-apply.

What is the best practice? to always fork on github and download from there?
and then update my repository with the tweaks?

then after every release merge the code with some nifty git feature?

I'm sure many are doing this, and I was wondering if someone could share best practices step by step..

[AbsolutelyFreeWeb]

ok, first problem, the repository is ongoing, but I'd like a repository where commits are done only on new releases....
hmm.. perhaps I can create one...

[atrol]

This is how our own trackers on www.mantisbt.org are updated
https://github.com/mantisbt/mantisbt-to ... rackers.sh

[AbsolutelyFreeWeb]

Thank you Atrol,

I'm on windows, so here is what I did after cloning:

git checkout -b latest-stable release-1.2.15 (this creates a branch for latest stable version)

git checkout -b 1.2.8 release-1.2.8 (this creates a branch for 1.2.8, the release I was based on)

then I started replacing the files that were changed on the 1.2.8 branch, when I was done I did:

git merge latest-stable

git commit

Voila ! I was done and ftp'd it up to the server...

[AbsolutelyFreeWeb]

git branch -m installation (renaming my branch which is now my new installation)
git push -v -u origin installation (uploads my branch remotely to my origin and creates a new branch and adds tracking between local and remote)