Let me start by saying I'm no Git genius (not by far) but perhaps that is exactly why I should pitch in. As far as I understand most of the problems come from authors sending out pull requests with either to many (small redundant commits) or without rebasing properly before opening a pull request. I really think we should have a look at gif-flow [1] or more particularly that branching model. Basically it's just a different workflow but I think we could really benefit from a tool like git flow helping one enforce the order of actions. I also think it would really help people create proper branches for new features and bugfixes which will be merged back appropriately. It really helped me a lot in working with Git. But perhaps I'm a little naive on this and missing the big picture.
- Marijn [1] https://github.com/nvie/gitflow [2] http://nvie.com/posts/a-successful-git-branching-model/ On Feb 18, 11:13 am, Bernhard Schussek <[email protected]> wrote: > > 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
