Git project to buind both Android and iOS


Currently I have an Ionic1 project under GIT control via bitbucket.
I generally develop with my Windows 7 PC from where I build the Android release.

Then I checkout the project into my macbook from where i build the iOS version.
Every time I push some news to the repo and the I go to the MAC to pull that changes, I struggle because some files are changed in the MAC, like config.xml or package.json since some plugins are not exacly the same version.
And I waste a lot of time…

Maybe I added some file to the git repo thta I should leave separated in the windows/android and MAC version?

Is there a best practice to manage this?

Thank you,