Remerge after reverting failed merge

Question

I have two branches in repository: feature and master. I have merged master into feature and pushed result to remote feature branch:

g         


        

Answer 1

If you execute the git revert, it will undo the merge, so I do not think the feature contains necessary changes. I will goes to the state before merge only with some additional git log. So you can freely merge it. But, if you do not want the additional git log, you can use git reset.

1. Check which is your wanted previous state:git log

2. git reset {commit-id-founded}

3. resolve your conflicts

4. merge again