> If we ask people to rebase their work before I can merge, it won't work > well. Due to the activity we have, the chances that you will have a clean > merge are minimal. So, I will keep asking for a rebase of pull requests.
I used to think so as well, but that's not feasible. You could only ever merge one PR at a time and wait for other PRs to rebase their work - which is kinda pointless. I preferred rebasing also because it gives you a clean timeline without all those "merged branch xy" commits. But Nils mentioned yesterday on IRC that you can easily filter out these commits with "git log". Together with his comment that rebasing can cause troubles later when debugging, that's enough reason for me to take changing our habits into consideration. @all: What's your experience with long-term maintenance of Git-based projects? I never did that, but since Nils did I trust him to know what he's talking about... Bernhard -- If you want to report a vulnerability issue on symfony, please send it to security at symfony-project.com You received this message because you are subscribed to the Google Groups "symfony developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/symfony-devs?hl=en
