Attempt at salvaging PR #479 #507
Conversation
* Add tmux versions 2.2 and 2.3 TravisCI * Mov gem deps from Gemfile to tmuxinator.gemspec Close tmuxinator#459. Close tmuxinator#465.
|
I'm glad it wasn't just me having problems with the previously merged changed being hidden. Nice solution. following |
|
So I'm going to vote that we ignore the CodeClimate issue so we can LGTM. Thoughts? |
|
@adamstrickland Would you like to do the honors? I'm feeling a bit skittish after my last attempt. |
|
Won't this error just keep reappearing on every new build, or can it be disabled permanently? How do I get the complexity rating on my own machine? I can try to "decomplexify" it, and remove the unidiomatic |
|
@HaleTom Good point/questions. I imagine the issue will persist... You could either pull my branch, make the change and submit a new PR (kicking off a new Code Climate run) or download the Code Climate CLI and try running that against the project locally*. I don't see a Code Climate config file anywhere, so I'm guessing it's using the default configuration. If you prefer the latter, let me know and I can update my PR if your fix checks out. FYI, I tried simply removing the * I've never tried this, so maybe someone else can chime in regards to its feasibility. /cc @Soliah @adamstrickland @J3RN |
4 participants
Some background:
After #479 was merged into master, the CI job began failing. I have to admit that I don't understand why this would have happened. It's possible that the test results on the branch were out of date and after I fixed what I thought were two trivial merge conflicts, the tests were re-run, the failures started and I overlooked them. However, those same changes locally did not result in any test failures.
Either way, after that went down, I reverted the botched PR using GitHub's "Revert" feature. Then when @HaleTom tried to re-open the PR by making a patch which attempted to fix the aforementioned failures on their branch, the original changes were being ignored because of the "Revert" commit.
This is an attempt to force Git to recognize the original changeset. The only solution I was able to come up with was checking out the original branch, applying the patch and then squashing the history. (If folks care about the branch history and know of a solution which preserves the commit history on the branch, I'd be all for it.)