Add merge --squash level #42

Merged
merged 1 commit into from Mar 27, 2012

Projects

None yet

2 participants

@sharnik
Contributor
sharnik commented Mar 25, 2012

A new level is in the commit.

@Gazler
Owner
Gazler commented Mar 26, 2012

I haven't had a chance to test this yet, but it looks like it will always return true: https://github.com/Gazler/githug/pull/42/files#L0R44 I think the last line is meant to be result

I'll hopefully get a chance to test this level tomorrow.

Thanks,
Gazler.

@sharnik
Contributor
sharnik commented Mar 26, 2012

Yes, you're basically right. First I had a version which was using return false everywhere before (as per documentation in README), but then I realised I can't return from this Proc and changed it to pass the result around and didn't adjust it properly.
Actually, in most cases it works, as the file3 doesn't exist, unless you merged and then an exception's thrown and interpreted as an invalid solution. But all the other cases don't work properly.

I've fixed the code.

@Gazler Gazler merged commit 762d698 into Gazler:master Mar 27, 2012
@Gazler
Owner
Gazler commented Mar 27, 2012

This is a nifty feature that I didn't know about.

Thanks for the level.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment