search

HaikuArchives / ffmpegGUI

GUI for FFmpeg
MIT License
23 stars 10 forks source link

Formatlayout #88

Closed humdingerb closed 1 year ago

humdingerb commented 1 year ago

Oops... I'll see if I can squash your already merged commits in there when merging...

andimachovec commented 1 year ago

Oops... I'll see if I can squash your already merged commits in there when merging...

This looks a bit messy, how did my commits end up in this pull request? I'm not enough of a github and git expert to exactly know what to do here but I'd cancel the pull request, rebase the formatlayout branch with master, resolve the conflicts, and then make a new PR.

humdingerb commented 1 year ago

There are still only my changes in there. It should be just a matter of squashing those 3 commits and editing the commit message.

andimachovec commented 1 year ago

Ok, great. That's much easier :-)

humdingerb commented 1 year ago

I take that as a vote to merge. :)

andimachovec commented 1 year ago

I take that as a vote to merge. :)

Ohh noo!!! Just kidding, yes it is ;-)