[ylem]

I find tortoisegit to be rather good for simple merges/commits on windows. For linux/macOS I just use the command line.