On 24/01/18 21:45, Michael Stapelberg wrote:
> I filed a wishlist bug for the remote configuration:
> To import it, AIUI, I should tag the latest upstream branch commit
> (7cafcd837844e784b526369c9bce262804aebc60) with tag
> upstream/0.0_git20160503.7cafcd8, then merge the upstream branch into
> the master branch with the merge strategy “theirs”.
What I do, is to first merge upstream at the point of the current
version (with --allow-unrelated-histories), which "should" be identical
to the current upstream, and after that merges are automatic.
> However, I can’t find a git-buildpackage command to take care of this.
> How do you do it? Manually?
Martín Ferrari (Tincho)
Pkg-go-maintainers mailing list