We are a small team of 5 developers. We just migrated from Subversion to Git and cannot find the right workflow for us.
We tried to stick to the gitflow workflow from the very beginning after the successful Git model of the branching model , but, frankly, it seems that for the vast majority, the small projects we are working on and some of us have difficulty following it strictly because it completely different from the subversion model we are used to.
So, right now we are using release branches to release releases because it seems unnecessary, although we make our wizard clean. We use function branches in the same way, but instead we work directly on development.
I’m not sure about releases, but I feel that we need to use function branches, I just don’t know how to work with them. In the mentioned article, as well as in the others that we read, she recommends storing functions locally and crushing commits in them before combining them for development. It looks easy if only one developer works in this function, but our scenario is that anyone at any time may want / should take the project in its current state and continue working on it. Thus, projects change hands a lot, and all work must be transferred to the server, even if it is not finished yet, so anyone can pull it and continue to work.
Thus, with all our work remotely, it’s difficult for us to keep clean, our history is a small list of small commits, but, as I understand it, we can’t go through them or reassemble any branch, because this will change public history.
We want to do it right, but not harder than necessary. So, any ideas on which workflow would be the best for us and how we can implement it correctly?