merging a branch

[Marc O'Sullivan]

Hi there,

I've done some work on a branch and now want to put the work back in the master and discard the branch. how do I do that?

Many thanks,

Marc

[Seth]

https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

[Johannes Kilian]

Basically you checkout your destination branch (master) and do a git merge branchname....

About "discarding a branch":

Have a look at  Git Branching - What a Branch Is. Deleting a branch is simply removing the symbolic name of the branch - all the commits done on the branch are preserved (that's one of the main purposes of a VCS: preserving old commits). If you want to get rid of all commits on the branch and want to have only one single commit (containing all changes made on the branch), there are more advanced git command (you have to do a git merge --squash ....)