Hello, I think that striving to have linear history rather than (sometimes crossed) merges is a worthwhile goal to keep the repository and history more tidy. The git branching model is something that I never been to fond of.
I don't have much experience with Github managed projects, but it seems that the default action to incorporate PRs into the master branch is to do merges. I think the "Rebase and merge" is to be preferred, however, it is offered as the last option in the web interface. Looking around in the web interface, it seems that it is not possible to change the default method used, it is only possible to disable the "Create a merge commit" and "Squash and merge" options (the later does not seem like a great idea to me anyway) to leave only "Rebase and merge". The heavyweight option is "Require linear history": it forbits merge commits altogether. This would probably be my preference, but it may be a bit too restrictive. What do people think? Cheers, Dan -- You received this message because you are subscribed to the Google Groups "Beancount" group. To unsubscribe from this group and stop receiving emails from it, send an email to beancount+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/beancount/d144a5c0-06d9-ba58-80cb-f11e8af57df8%40grinta.net.
