Resolve Merge Conflicts And Revert Git Commits Already Pushed To A Remote Repository
Most of the time we may face merge conflicts when we are sending PR requests. Reason is that we work on a different branch and commits our changes to that branch. At that time, other contributors may commit to the master branch. In git, merging happens based on the time stamp you have made the …