Jani Nikula <jani at nikula.org> writes: > nmbug pull only merges upstream master, but nmbug push tries to push > all local branches. The asymmetry results in conflicts whenever there > have been changes in the config branch in the origin: pushed. d