Scribery / cockpit

Cockpit fork for work on Session Recording UI
http://www.cockpit-project.org/
GNU Lesser General Public License v2.1
6 stars 3 forks source link

Rebase to Cockpit 165 #82

Closed sabbaka closed 6 years ago

sabbaka commented 6 years ago

Rebase to Cockpit 165

spbnick commented 6 years ago

I see that this is being rebased onto something later than the 165 release of Cockpit, not the exact 165 release, and that you're also adding the "Fix wrong space" on top of it. Just making sure you're aware. Otherwise it looks good and, after all, it is up to you now to push this :)

spbnick commented 6 years ago

I suspect that using the GitHub UI would work well here, you'll need to push directly. You might need to disable force-push protection for the branch in the GitHub repo settings, though.