Managing Android project using Git and Eclipse

Question

I believe I have a very common problem that affects developers with multiple versions of their apps (in my case I have two: paid one and a free one). To manage both versions I use the same git project with 2 different branches: free and paid However my source code package names differ from each other (as expected), and with the java restrictions of having the directory names mapping to package names a problem arises: how to tell git to associate the files under a certain directory with each branch ?

Let me give you an example: I've two branches:

master
free

In master my source code is under com.zemariamm, however in the "free" branch the source code is under "com.zemariamm.free", how can I configure git to "tell him" that the source code under directory com.zemariamm (in branch master) maps to the source code under directory com.zemariamm.free (in branch free) ?

Thanks so much in advance, Ze

Can't you just share all the common code libraries, rather than having duplicates in the free and paid packages? — Eric
– Eric, Commented Mar 6, 2011 at 19:01
What do you mean? Having two different projects using parts of the source code ? Cheers :) — user361526
– user361526, Commented Mar 7, 2011 at 19:22

Community · Accepted Answer · 2017-05-23 12:19:53Z

2

In theory, you wouldn't configure anything in Git:
If the content of com.zemariamm.free.MyClass is very similar to com.zemariamm.MyClass, Git should be able to link the history of the MyClass file between the two directories in the two different branches.

In particular, a merge from free to master should report new evolutions (lines added, modified or removed to MyClass) from the com.zemariamm.free.MyClass to the com.zemariamm.MyClass.

That only works if MyClass is "similar enough between the two branches though:
see "How does Git track history during a refactoring ?"

edited May 23, 2017 at 12:19

CommunityBot

11 silver badge

answered Mar 6, 2011 at 19:00

VonC

1.4m569 gold badges4.8k silver badges5.7k bronze badges

Sign up to request clarification or add additional context in comments.

Comments

Eric · Accepted Answer · 2011-03-06 19:04:07Z

0

Why not put just put both the free and paid code in one project, rather than using two projects?

answered Mar 6, 2011 at 19:04

Eric

98.1k54 gold badges257 silver badges389 bronze badges

Collectives™ on Stack Overflow

Managing Android project using Git and Eclipse

2 Answers 2

Comments

Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

Comments

Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related