Git merge branch from detached

Question

I have sample where git merge gives unexpected for me result.

Here master branch has commit #3 with unwanted changes. I checkouts to stable commit #2 and creates new branch with additional usage. Can I merge new_branch into master with all three lines? Thanks for help!

Link to repository

Yes you can do the merge, but is this something you really want to do? Your question is not clear enough to me to understand the business logic. — Tim Biegeleisen, Feb 26 '16 at 10:39

score 1 · Answer 1 · answered Feb 26 '16 at 10:41

1

You can merge new_branch into master then revert #3.

Or, you can reset master to new_branch

git checkout master git reset --hard new_branch

answered Feb 26 '16 at 10:41

xuanduc987

1,067
1
9
10

score 0 · Answer 2 · answered Feb 26 '16 at 12:05

0

you should make commit #3 and #4 into new_branch, try rebase command

git checkout new_branch
git rebase master
git checkout master
git merge new_branch

If there is a conflict, you should resolve it.

Or just make your changes into the master branch

answered Feb 26 '16 at 12:05

yanghaogn

833
7
15

Git merge branch from detached

2 Answers2