How to roll back my change in Git?

Asked Apr 20 '18 at 22:15

Active Apr 21 '18 at 01:04

Viewed 41 times

I committed change A into my feature branch.
All good so I merged to Develop. Two other merges B & C, are done to Develop from other feature branches.

A problem comes up with my change so I have to roll back.

Q1. What should I do?

I check out an old version of Develop (the most recent before A), copy it off, revert back to head, then paste over.

Q2. I was hoping to re-apply changes B & C but no diff so can't.
Anything I can do to reapply B & C? Or was the problem unfixable at Q1?

edited Apr 21 '18 at 01:04

CodeWizard

128,036
21
144
167

asked Apr 20 '18 at 22:15

Scala Enthusiast

do the other 2 merges touch the same files/lines as your merge? if not, you can probably just `git revert commit^..range` – Robbie Apr 20 '18 at 22:22
I’d suggest reset develop pre branchA merge and then re-merge B and C. – evolutionxbox Apr 20 '18 at 23:47
Read the supplied answer to the duplicate question and then use `git cherry-pick` if you need to pick specific commits – CodeWizard Apr 21 '18 at 01:05

How to roll back my change in Git?

0 Answers0