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: pushed. d
Subject: Re: [PATCH] nmbug: only push master branch on nmbug push
Date: Thu, 14 Feb 2013 07:58:29 -0400
To: Jani Nikula, notmuch@notmuchmail.org
Cc:
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: pushed. d