Re: Git repos: missing tags
* Dominic Hargreaves:
>> My local branch branch up to tag debian/0.992-6 and the master branch on
>> git.debian.org have diverged by 3 commits each. What should I do?
>>
>> Should I rebase those three commits onto my branch and git push --force
>> or should I rather create a merge commit?
>
> You should not force push to master.
>
> However, if you rebase your local master against the origin master,
> you should not have to force push. Rebasing is preferred over merging
> when integrating local changes as it creates a clean history.
The local tag I am referrig to is debian/0.992-6, corresponding to the
version of sepia in the archive (It was set as I built that source
package using gbp buildpackage). Rebasing my local changes would not
make much sense here.
Cheers,
-Hilko
Reply to: