Closed mergwyn closed 5 years ago
Hi @mergwyn, thanks for the PR. Can you please squash the comits down?
I can do - but how do I do that?
Gary
On Mon, 26 Nov 2018 at 12:20, Tim Meusel notifications@github.com wrote:
Hi @mergwyn https://github.com/mergwyn, thanks for the PR. Can you please squash the comits down?
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/voxpupuli/puppet-tvheadend/pull/22#issuecomment-441619977, or mute the thread https://github.com/notifications/unsubscribe-auth/ARSG8eI9r6-2bizFuFlizsymPWexTlLeks5uy9yDgaJpZM4YvaXT .
Hi. A brief overview:
git fetch --all --prune
git rebase -i $voxpupuliremote/master
git push -f
You can join our IRC channel #voxpupuli on freenode or our slack channel at https://slack.puppet.com if you've more questions or run into specific issues. Those are easier to handle during a real chat.
Squash done (I think), now error "Gem::RuntimeRequirementNotMetError: parallel_tests requires Ruby version >= 2.2.0. The current ruby version is 2.1.0." Not sure what this is!
@mergwyn, sorry for not coming back to you, this PR slipt through. Would you mind rebasing against our latest master?
Hopefully this is OK now.
Thanks!
Pull Request (PR) description
Updates repository as per https://tvheadend.org/projects/tvheadend/wiki/AptRepositories
This Pull Request (PR) fixes the following issues
Fixes #21