Re: [Gnumed-devel] Git pull request: template branch

[Karsten Hilbert]

On Tue, Jun 22, 2010 at 01:54:39PM +0200, Karsten Hilbert wrote:

> 3) just to be safe:
> 
>       git checkout master
>       git branch test-basti
> 
> 4) test-merge his code:
> 
>       git checkout test-basti
>       git merge basti-public/template
> 
> I now have his template branch merged with a copy of my master.

Observing that this worked w/o conflicts I repeated it with
my master:

        git checkout master
        git merge basti-public/template

Oops forgot CHANGELOG entry.

        mc -e CHANGELOG
        git commit -v --amend
        git log

                commit 55e9a771bd36505cb9f67be81e68c1cf15e6d115
                Author: Sebastian Hilbert <address@hidden(none)>
                Date:   Sun Jun 20 13:23:32 2010 +0200

                Plugin creation templates by S.Hilbert.

        - added a set of templates for coding a plugin
        - comments are inside each file

And pushing to my public repository:

        git push -v gm-public

Cleanup:

        git branch -d test-basti (fails since not merged)
        git branch -D test-basti (force drop)

Karsten
-- 
GPG key ID E4071346 @ wwwkeys.pgp.net
E167 67FD A291 2BEA 73BD  4537 78B9 A9F9 E407 1346