Erstellen einer eigenen Merge Strategie (Git Merge Driver):

Name des Merge Drivers: ours
git config –global merge.ours.driver true

echo ‘.idea/deployment.xml merge=ours’ >> .gitattributes
git add .gitattributes
git commit -m ‘Branch depended Deployment Settings’

Categories: AllgemeinDevelopment