I always rebase my git patches. I have not found a use-case for merging yet. If you use git merge: why? I don't like merge commits because they pollute my git history.
@knievelcat My team merges between concurrently maintained release branches.
Say we have an old LTS branch where we only make security fixes, a stable branch were smaller features are implemented, and an unstable development branch. We merge frequently from the older branches into the newer ones to make sure no fixes are lost.
The actual development process within those branches is linear, i.e. pull requests are rebased upon acceptance.
@sandro I guess that's a use-case for merging I haven't thought of yet. I don't maintain anything where I merge PRs from others but if I do I will probably also merge
@knievelcat I'm not so fond of linear history, because it hides conflict resolution of parallel work, as well as the fact that parallel work is happening.
What is noise to you is historical information to me. To each their own?
@knievelcat@amazonawaws.com
