I have a project, based on some open-source project. Usually I merge changes which I made with changes in origin project monthly. Several months ago I'd done the same routine, merged the changes and committed them to the master. But then I realised that I have not tested the project properly. There were a lot of critical errors so, in order to resolve the issues ASAP, I did a mistake. I just reverted most of the merged files into the state them were before merging. And committed the project again. Now I have working project based on 3-months-ago-version of origin project. And I do not know, how to merge it again, because when I try to do the merge, git do not suggest me to merge the changes which it suggested me before. Please could you tell me what is the best way to resolve this issue? I would like so save as more information about git commits in both branches as possible.
Asked
Active
Viewed 14 times
