Module 2 Setup1

I have accepted only the incoming changes for the mergeconflict.But now I came to know that I need previous changes also .So ,I want to get the previous changes also.How to do that?

if you did not commit after solving merge conflicts then you can use git reset --hard to go to previous commit
or else you have to use gitlab to find the commit number and then go to that state

1 Like

Do we have to accept all the changes and then manually remove not required function for solving merge conflicts?

yes accept both but its your decision which to keep and which one to discard

1 Like