Please excuse me if this is not the correct place to ask this question. I will gladly post it elsewhere would you take the time to show me where.
I am starting a new pet project where I'll work with an existing Java git project. Said project has many branches, which got stopped at some point
Main Project - Develop (up to date) - Saison 4 (ended 2017) - Saison 3 (ended 2016) - Saison 2 (ended 2015)
As you can guess, the branches stopped at various past dates. I want to downgrade from the develop branch to the Saison 2 branch, keeping the major bugfixes, security updates and various improvements of the develop branch, while getting back to various features of the Saison 2 branch.
What would be the best software / tool to use in order to do that ?
I tried to simply compare the two branches within Eclipse, but the huge number of files makes it crash (4,266 files) and the Synchronize view is not really helping.
Thank you for any suggestion !