CODEWITHSUNDEEP
gitbranching-and-merging
Matthias B
Matthias B

Reputation: 5577

Remove conflicted branch in git

I am using git for my projects, and some days ago I commited the same changes on on two clients. then I pushed both commits to the central repo. now I have a branch with conflict:

git branch
* master
  master (In Konflikt stehende Kopie von Matthias 2011-05-24)

For non German speaking users: master (conflicted copy by Matthias 2011-05-24)

How can I delete this conflicted master branch? Both contain exactly the same data, except for the commit message.

Upvotes: 1

Views: 2497

Answers (1)

dexter
dexter

Reputation: 13583

Have you tried this

git branch -D "master (In Konflikt stehende Kopie von Matthias 2011-05-24)"

The -D flag forces the deletion even when the current branch is not a descendant of the conflicted branch.

Upvotes: 5

Related Questions