The only Git Gui I've used extensively is magit, and patch worked fine. It's very much like cherry picking commit or doing merge. There can be conflict so be sure to use `--3way` flag.