Manage your Android project with Git and Eclipse

I believe that I have a very common problem that affects developers with several versions of their applications (in my case, I have two: paid and free). To manage both versions, I use the same git project with two different branches: free and paid. However, the names of the source code of the source code are different from each other (as expected), and with restrictions on java that the mapping of directory names to package names occurs problem: how to tell git to associate files in a specific directory with each branch

Let me give an example: I have two branches:

  • master
  • is free

In my source code is 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 is in the com.zemariamm directory (in the main branch) Is source code displayed in the com.zemariamm.free directory (in a free branch)?

Thanks a lot in advance, Ze

+5
source share
2 answers

In theory, you will not configure anything in Git:
If the content is com.zemariamm.free.MyClassvery similar com.zemariamm.MyClass, Git should be able to link the history of the file MyClassbetween two directories in two different branches.

, free master ( , MyClass) com.zemariamm.free.MyClass com.zemariamm.MyClass.

, MyClass : . " Git ?

+2

, ?

0

All Articles