3 ms·

I work with feature branches for iOS development as follows: Whenever I want to create a new feature or fix a bug, I create a new branch. I am responsible to r

I work with feature branches for iOS development as follows: Whenever I want to create a new feature or fix a bug, I create a new branch. I am responsible to rebase and keep the branch up-to-date until it is reviewed and merged. When the branch is merged into master, using @KrausFX's fastlane tools we automatically build, test, submit a build to testflight and create a pre-release with the build number on GitHub. The appropriate people then review the App and submit a release for review by Apple whenever they're ready. Once the App is approved and released we create the corresponding official release on GitHub. Works well and keeps us productive. As I may have overlooked something, could you pinpoint where in this workflow you would have issues?

prats226 11y ago
Since we are in early stage of our app, we release android app once every two days. Most of the problems are because since features need to built faster, we are lacking in sufficient tests. Also multiple people end up working on same file. Major problem is that if some spurious code goes into development branch and other people create feature branches from it, it becomes a problem. I think using --no-ff flag to merge and the using revert to remove such code should work well. Will try that out.