git and branches

James Hogan james at albanarts.com
Wed Dec 15 21:41:46 GMT 2010


On Wed, Dec 15, 2010 at 10:25:30PM +0100, Cyrille Berger Skott wrote:
> When you are finished with a branch, you want to have it merged into master, 
> then you do:
>  git checkout master
>  git merge branch_name
> 
> And to remove your branch:
>  git branch -d branch_name
> 
> If it was a shared branch, you will need to contact repo's admin (right now, 
> Ian Monroe, Boudewijn and me, we will probably add more later) to delete the 
> branch on the server (I have no clue how to do that :) ).

Sorry if this isn't what you meant, but FYI you can usually delete a
branch from a remote git repo by prefixing it with a colon in the push
command:
 git push origin :branch_name

Cheers
James



More information about the calligra-devel mailing list