Pull up changes from xenial into edge

ubports / keyboard-component

Moved to https://gitlab.com/ubports/core/lomiri-keyboard

GNU Lesser General Public License v3.0

10 stars 36 forks source link

Closed dobey closed 5 years ago

UniversalSuperBox commented 5 years ago

I think I'd rather rebase the edge patches over the current state of xenial. Would you be okay with this?

dobey commented 5 years ago

I think I'd rather rebase the edge patches over the current state of xenial. Would you be okay with this?

Wouldn't "rebase and merge" do this?

UniversalSuperBox commented 5 years ago

No, rebasing xenial onto edge would put these commits on top of the edge commits. I want to rebase edge onto xenial so we can merge cleanly later.

dobey commented 5 years ago

OK. It's fine by me, but I think it should merge cleanly either way, with "squash and merge" option.