How to merge two projects

I'm using SourceTree and github. The version i'm using currently on my main computer has my game. My computer recently broke down so i have been doing work on my dads computer. I did some work on my main computer before copying to my dads computer. So my main copy has map state saving but doesn't have upgrades implemented.My dads computer copy has upgrades implemented but doesn't have map state saving as it was a different copy. How do i merge the two projects, only saving the changes between the two, so that my main copy will have map state saving as well as upgrades implemented?

 

Save part / whole of the project as an asset. Then import to other project.
You can choose what to import.

Having git repository and backups before doing so, is good idea.

 

So i export the project on my dads PC as a package and import it into my main copy?

 

Yep. During import, you can select, which files specifically you want to import.
So for example export whole project, then import whole, but tick only files, which you need.

Of course, take special care, if you decide to override existing files.

 

Worked perfectly, cheers.