We do source code version management for a long time using Subversion but now plan to look into migrating to GIT.
As a first step, we want to test the merge capabilities of GIT by merging version 6 and 6.1 of our software. Version 6.1 is currently a branch of version 6 an both are managed using Subversion.
If you have ideas and experience how we could test with minimal effort to merge both versions with GIT, your ideas and online assistance are most welcome.
Ideally, you are well experienced using GIT to help us with this task. Also, yo don't need to be a Subversion expert since we can cover this knowledge part.