understood, done. cheers
2015-06-25 15:40 GMT+01:00 Ian Dunlop <[email protected]>: > Hello, > > I keep running into merge conflicts each time I fetch the latest code. > There are a few directories and files checked in to git which cause issues > when merging since they are user specific ide property and build files. I > suggest doing something like the following to remove this problem: > > git rm --cached -r app/build/ > git rm --cached -r .idea > git rm --cached -r .\app\app.iml > git rm --cached -r .\build\intermediates > git rm --cached -r .\local.properties > > Then add them to .gitignore > > /local.properties > /.idea/ > /build > /app/build > /app/app.iml > > > This should keep your local copies but remove them from future commits. > > Cheers, > > Ian > -- *Akah Larry N.H* *Lead Software Engineer @ GiftedMom* *Founder IceTeck Inc* *www.iceteck.com* Developing technologies for emergence and sustainable development.
