disable squash merge?

Question

disable squash merge?

simonbyrne opened this issue 8 years ago · 4 comments

Given JuliaLang/julia#19624, should we disable squash merge until the fix is in the release version?

Answer 1 · 2016-12-16T16:08:02.000Z

Or fix PkgDev to create a branch when tagging, which we've needed to do for some time.

Answer 2 · 2016-12-16T18:14:36.000Z

And for attobot pr's the libgit2 issue won't matter. I personally prefer the history being a bit more compact with less merge commit noise, but if it's causing people local hassle then I guess it should be avoided for old-style tag pr's until libgit2 bindings or pkgdev get fixed.

Answer 3 · 2017-03-22T09:00:48.000Z

It's not that bad to just manually git reset --hard origin/metadata-v2 after every PkgDev tag. Ideally it should be documented with PkgDev though.

Answer 4 · 2017-05-04T03:34:39.000Z

fixed in 0.5.1