DEV Community

Discussion on: Another conflict: resolving conflicts in git that occur when using rebase.

Collapse
 
jacqueline profile image
Jacqueline Binya

Thank you loads.
Your suggestion is really dope and indeed as you said if you can see the initial state before the changes, resolution becomes way easier.
I will definitely start implementing this approach.:)