A
A
Alexander2017-10-19 20:05:46
git
Alexander, 2017-10-19 20:05:46

How to merge the first branch into the second, if in the first branch the merge of the second into it was canceled using revert?

Inadvertently merged an untested feature into the release branch, and then canceled the merge using revert. Now I want to merge the release into a branch with a feature, but when merging, all changes are deleted / canceled to the state of the release branch.

Answer the question

In order to leave comments, you need to log in

1 answer(s)
A
Alexander, 2017-10-20
@wiggle

The problem was solved by reverting the commit with reverting from the first branch after the first branch merge to the second

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question