Saving Pro and Lite versions on different branches

Question

I have a pro version and a lite version of the application that have almost identical code bases. The difference is that the Lite version has ads in various view controllers, as well as in app purchases. I have each version on my own branch in Git, while the Lite version is the lead branch.

I localized the pro version, switched all the lines to the NSLocalized line, added localization files, etc. I am wondering what is the best way to combine these changes into a lite version without overwriting the differences between them. When I open a "merge into ..." session in Xcode, it automatically overwrites the differences.

Is there a way to skip a block of code in a merge?

There may not be a solution for this, but before I do it manually, I just want to check.

Answer 1

This is not a git problem, but a project structure problem. You should never try to abuse git branches for this purpose. Instead, you should have used the Xcode project / workspace objects (or framework) to organize the code itself so that it can be shared between the two goals.