Our workflow:
We have a development branch in which all new features and corrections have been put forward. We cut the release_candidate branch from the development branch, which then goes to master after release.
For individual functions and fixes, each developer creates a function branch. We have git configured by default on git pull --rebase. Each branch of a function is usually a local branch, which we often redo from development. This preserves a good clean commit history, a simple merge into development, and we can easily present the changes in the function branch for viewing as a patch. As for the local branches, this stream is ideal. This causes minimal fuss, leads to a clean commit history, and allows us to compress the commit when merging in development.
Problem:
The problem arose when we had several long branches of functions that were removed for remote backup and collaboration. However, frequent reloading of the remote function branch was a disaster (due to our own lack of understanding of how rebase works). Since then, we have learned to not rebuild public function branches.
Question:
What will be the clean git workflow for remote function branches? We need to maintain the ability to make changes to the development while continuing to work on the feature branch, as it may contain corrections. We would also like to keep a clean commit history and the ability to analyze (we use the arc) the function branch as a patch that can be quickly redirected to development.
, ,
. .
: