Reputation: 183
Me and my friend started building our first app on android. We started on one laptop and then copied project to another laptop too. Now we started doing our part on android separately. Now i have to combine the work in one app, So when I tried to import the other project to my workspace, it says "Some projects cannot be imported because they already exist in the workspace" I tried changing my package name too. But even after that, the same warning comes. what to do? thanks
Upvotes: 1
Views: 149
Reputation: 16393
If you don't want to do version control, you can use a diff program to comnpare the two files and merge the differences. Set it up to compare, make the changes to "your" copy, and you should be set to go.
I've used ExamDiff to great success before (they have a very usable free version).
And here's a list of diff software.
Upvotes: 0
Reputation: 16393
You need to set up some sort of repository with version control, then both of you can check out code, work on it and check it back in. The versioning system will keep track of everything, perform merges and flag conflicts for you.
Some info about Revision Control
And a list of various software
Upvotes: 2