Jani Nikula <jani@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: LGTM d
Subject: Re: [PATCH] nmbug: only push master branch on nmbug push
Date: Sat, 09 Feb 2013 21:26:13 -0400
To: Jani Nikula, notmuch@notmuchmail.org
Cc: Tomi Ollila
From: David Bremner
Jani Nikula <jani@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: LGTM d