Re: [SCM] Debian package checker branch, master, updated. 8a8b3a321e13fc12428578211209138a2b5304c3
On Sat, Jun 21, 2008 at 12:51:20PM +0100, Adam D. Barratt wrote:
> On Sat, 2008-06-21 at 11:42 +0000, Adam D. Barratt wrote:
> > The following commit has been merged in the master branch:
> > commit 8a8b3a321e13fc12428578211209138a2b5304c3
> > Merge: 2af70f12d11bfa3ad6c673a4f8c9d113893d1775 be0eff50bb2c24471599bb77b0fc7d3a4883212f
> > Author: Adam D. Barratt <adam@adam-barratt.org.uk>
> > Date: Sat Jun 21 12:42:18 2008 +0100
> >
> > Merge branch 'master' of git+ssh://adam-guest@git.debian.org/git/lintian/lintian
>
> Not quite sure what happened there, but I assume it's because I forgot
> to do a pull before pushing my change so I hadn't picked up Frank's last
> commit.
>
> The first push failed but I'm guessing I missed a step before repushing
> after pulling.
You can use git pull --rebase to avoid to create a merge commit.
Gruesse,
--
Frank Lichtenheld <djpig@debian.org>
www: http://www.djpig.de/
Reply to: