For a new project we try to set up the development process and the intention is to have a simple, pragmatic process. We use Atlassian Stash with Git in our company.
We came up with the following proposal:
In the central repo exist two branches
All development takes place in the
development branch and all commits are done in this branch.
If a developer has finished a feature, he creates a pull request so the new feature can be reviewed and merged into
production, where all the final testing and deployment takes place.
In today's discussion arised the question, if it's possible to create a pull request for one feature, if different developers develop different features in one branch.
So the commits would look like this:
commit 1: feature 1
commit 2: feature 1
commit 3: feature 2
commit 4: feature 1
commit 5: feature 3
commit 6: feature 4
commit 7: feature 1
Is it even possible to have a pull request, which incorporates the commits 1, 2, 4 and 7 without the commits in between?
I'm aware of the concept "one branch for each feature", but for the moment we try to set up a simple process without too many branches, because the developers come from SVN and don't have much experience with Git.
EDIT: I googled around a little more and probably the GitHub flow strategy might be what we are looking for.