Kerry du Plessis
·Low-code sprout.

Issues with Merging

Hello FlutterFlow community, 👋

As a collaborative team working on a project, we've implemented a workflow where each member creates individual branches to work on specific tasks. This approach, was chosen for its practicality in facilitating simultaneous work on the project.

We initiated this process in response to instances where individual contributors, upon resuming work, inadvertently overwrote changes made by others who had worked on the project in their absence. However, as we've progressed, we've encountered a new challenge. With multiple team members—typically three or four—working concurrently on their respective branches and subsequently merging their changes, we're finding that this can sometimes lead to conflicts and the potential loss of work that has already been merged into the main branch.

We're now curious to learn whether other members of the community have encountered similar challenges or if this issue is already being addressed by the FlutterFlow development team. Sharing insights and experiences on this matter would be greatly appreciated as we seek to refine our collaborative workflow.

Thanks!

1
1 reply