IntelliJ Project Files

I saw this option in Upsource, so I went to my project (android) and added the project files. It's kind of a nuisance though we are getting conflicts and developers are complaining.

Is there some combination of some of the project files being in there and some being ignored that will keep upsource easily setup to use the project yet will leave us conflict free?

3 comments

Hi,

Two quick questions in order to understand what happened:

1. Do you use gradle?
2. Did you commit .idea/* to your vcs?

Thanks in advance.

0

Yes. Using the latest Android Studio release from the channel but also have Ultimate Edition. Gradle build.

Here is my .gitignore file:

# built application files

*.apk

*.ap_

# files for the dex VM

*.dex

# Java class files

*.class

# generated files

bin/

gen/

build/

# Local configuration file (sdk path, etc)

local.properties

# Mac

.DS_Store

# Android Studio

.gradle

.idea

/*/local.properties

/*/out

/*/build

/*/*/build

*.iml

*.iws

*.ipr

*~

*.swp

workspace.xml

tasks.xml


object.data

Good chance I am an idiot here. I looked all over for documentation of recommended tracking or a gitignore to use.

Thanks!

0

Thanks for the info.

Since .idea folder is included to .gitignore file what kind of conflicts your developers are complaining about?

0

Please sign in to leave a comment.