On Sun, Jul 14, 2019 at 09:54:40AM +0100, Rebecca N. Palmer wrote:
> > If a remote has a branch this doesn't mean your repo has the same branch.
> Is this intended as agreement with my "rename upstream/master with git
> branch -u" proposal? Or is it a suggestion to delete Salsa/master and
>
Andrey Rahmatullin wrote:
If a remote has a branch this doesn't mean your repo has the same branch.
Is this intended as agreement with my "rename upstream/master with git
branch -u" proposal? Or is it a suggestion to delete Salsa/master and
force-push upstream/master over it (i.e. rewrite
On Sat, Jul 13, 2019 at 02:41:18PM +0100, Rebecca N. Palmer wrote:
> (b) How do I deal with branch/tag name conflicts between upstream and
> packaging?
They shouldn't happen.
> There are at least two ways conflicts can happen by accident:
>
> (i) gbp defaults to naming the packaging branch
(a) The git-buildpackage manual [0] mentions, and [1] further discusses,
a workflow that imports *both* upstream's git and upstream's tarball of
the same release:
upstream-vcsuUuuUu
\ \
upstream-for-gbp
4 matches
Mail list logo
