Hi everyone! I’m recently diving more in depth into git and I’m currently fighting with branching. All I want to do is this:
Assuming I just finished working on the shoot-system feature branch of the Realm Rush game , I commit the work and merge it back to the develop branch. Then i branch again form “develop” into a new feature branch called “enemy-spawner” to work on (guess it) the EnemySpawner class.
I work on the enemy spawner for a bit and i end up in a situation like this:
Now, what I’d like to do is to further improve the shooting system working into its own branch, BUT including the changes i’ve made while working in enemy-spawner.
Hope this is clear enough. Can someone help me with this?