search

nus-cs2113-AY2223S1 / forum

4 stars 0 forks source link

Accidentally merge without fast-forward #12

Closed joshuan98 closed 2 years ago

joshuan98 commented 2 years ago

Does anyone know how to revert a fast-forward merge? I accidentally selected the wrong checkbox.

okkhoy commented 2 years ago

You need to checkout the commit where you did the branch, branch again, cherrypick the commits you want in the branch from what you already have, then re-merge and select without fast-forward option. Ping me on Monday if you are confused, I can help out.

joshuan98 commented 2 years ago

Not too sure if I did it right but it is reflected correctly in the IP dashboard so I will close this thread