fastlane/ci

Git branching strategy

Ashraf-Ali-aa opened this issue · 1 comments

Would it be worth adopting a new the branching strategy for the project, currently when pull requests are merged they are branched off at a certain point and directly merged in after all the CI check but the issue is it hard to follow when the branch gets merged and also makes it difficult to do a git bisect.

Previous

image

Updated

Before a pull request gets merged it would need to be rebased against the latest master branch using the following command.

git rebase --onto origin/master 66b1cf25c
https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase

image

We decided to pause our work on fastlane.ci to focus on the core fastlane product as we have a lot on the roadmap. You can find more information on the main GitHub page. This issue will be auto-closed 👍