Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
class-ify ShuffleRegionJoin, force setting seqdict #698
referenced this pull request
Jun 2, 2015
added a commit
this pull request
Jun 3, 2015
Merged! Thanks @ryan-williams!
Yeah, we prefer everything to be rebased before merging in. If all PRs are rebased on ToT before they are merged, we keep a linear commit history. This is IMO a funky design decision in git... In any case, if a PR is small and is not rebased on ToT, we'll manually rebase and merge it.
Yeah. I mean, obviously this is personal preference but I can't fathom a reason that you'd want a non-linear commit history.
There are also funky design decisions in Github. E.g., the "is this rebased?" question would go away completely if Github exposed the option to only allow fast forward merges. But—god knows why—Github goes the opposite way and disallows fast forward merges via the merge button...
Anyways, this is frankly personal preference. I mostly love git and Github. ;)
Makes sense; I've slowly come to want to embrace branching/merging over squashing/rebasing, but it's been a process and taken work.
Github disallowing fast-forward merges, interesting… I guess it doesn't really make sense to merge something that hasn't really been branched (e.g. is an ancestor of