3 ms·
I prefer to have every commit into the main branch be a merge. Work in your feature branch, do whatever you want, then use a single merge commit when it comes i
by l72 3y ago
I prefer to have every commit into the main branch be a merge. Work in your feature branch, do whatever you want, then use a single merge commit when it comes into the main branch. Then you can do a `git log --first-parent` and only see the merge commits. It gives a nice clean history and IF you need to dig down into the feature branch that was merged in, you still can!
- Volundr 3y agoThis is my preference as well. Gives you the option of looking at the nice manicured "this is how I wish it happened" view, and when needed/helpful you can dig into the nitty gritty of what really happened with all its false starts and mistakes. But most orgs don't do that, so rebase it is.