For small projects, I have a master + features branches, for others, a stable master, a "less" stable develop + features branches.
master
master,
develop
In every cases, small commits and regular interactive rebases in feature branches are my way to keep it clean.
Oh, and no merge commits, only fast-forward merges.
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
For small projects, I have a
master+ features branches, for others, a stablemaster,a "less" stabledevelop+ features branches.In every cases, small commits and regular interactive rebases in feature branches are my way to keep it clean.
Oh, and no merge commits, only fast-forward merges.