I'm tracking my changes on a PHP-software with git. I have only a master branch and about 10 commits, the first commit was the original version 1.0 of the software.
Now I saw, that the owner of the PHP-software released version 1.1.
What is the best an easiest way for me, to update the software, but keep my own changes too and merge them with git mergetool? Should I use patches or create another branch with the untouched version updates?
Thank you!
See Question&Answers more detail:os