What to do with branch after merge

by

After the merge, it’s safe to delete the branch:

git branch -d branch1

Additionally, git will warn you (and refuse to delete the branch) if it thinks you didn’t fully merge it yet. If you forcefully delete a branch (with git branch -D) which is not completely merged yet, you have to do some tricks to get the unmerged commits back though (see below).

There are some reasons to keep a branch around though. For example, if it’s a feature branch, you may want to be able to do bugfixes on that feature still inside that branch.

If you also want to delete the branch on a remote host, you can do:

git push origin :branch1

Or its equivalent:

git push -d origin branch1

This will forcefully delete the branch on the remote (this will not affect already checked-out repositiories though and won’t prevent anyone with push access to re-push/create it).

git reflog shows the recently checked out revisions. Any branch you’ve had checked out in the recent repository history will also show up there. Aside from that, git fsck will be the tool of choice at any case of commit-loss in git.

More Related Contents:

  1. Git – how to force merge conflict and manual merge on selected file
  2. Can I make fast forwarding be off by default in git?
  3. Pull a certain branch from the remote server
  4. git merge: Removing files I want to keep!
  5. Git: Merge to master while automatically choosing to overwrite master files with branch
  6. What exactly do we mean by “branch”?
  7. How to merge a specific commit in Git
  8. Can I recover a branch after its deletion in Git?
  9. Track all remote git branches as local branches
  10. Git cherry pick and datamodel integrity
  11. Updates were rejected because the remote contains work that you do not have locally
  12. Why do I have to “git push –set-upstream origin “?
  13. How is a tag different from a branch in Git? Which should I use, here?
  14. `git merge -s theirs` needed but it does not exist
  15. Git Cherry-pick vs Merge Workflow
  16. git working on two branches simultaneously
  17. How do I create a remote Git branch?
  18. Trying To Understand/Determine A Basic Git Workflow
  19. How to commit my current changes to a different branch in Git [duplicate]
  20. git rebase and git push: non-fast forward, why use?
  21. How do you remove an invalid remote branch reference from Git?
  22. How to get default Git branch?
  23. How do I list all remote branches in Git 1.7+?
  24. How do I create a new Git branch from an old commit? [duplicate]
  25. In git, how do I remove a commit from one branch and apply it to a different branch?
  26. git: How do I add a custom merge strategy?
  27. Get all files that have been modified in git branch
  28. Git and working on multiple branches
  29. Can git permanently ignore a remote branch?
  30. Line endings messed up in Git – how to track changes from another branch after a huge line ending fix?

Leave a Comment