CODEWITHSUNDEEP
gitgithubgit-merge
NooZ Production
NooZ Production

Reputation: 41

Merge and reverse

I have a problem with git. I'm pretty new to git. Me and my team are working on the project and I accidentally merged branches. After I merged other team member pushed and after that I pulled. After I pulled, my code stopped working. It doesn’t matter what I write, it just doesn’t underline the line. Any solutions?

Upvotes: 2

Views: 52

Answers (1)

ema
ema

Reputation: 5773

You should identify the commit in which everything was working and checkout the directory to that commit. You can also create a new branch from that commit.

Another option is to use sourcetree to identify the differences between two commits to find what is wrong after you last pull.

Nobody can give you the right solution, you should inspect the history and find what went wrong. Anyway if you commit push and pull regularly everything is stored and the working solution is preserved....it only a matter of find it :-)

Upvotes: 1

Related Questions