Here is the situation, I cloned a repository from some server and start to work on local, everything was fine until I have to send all my work to prod on this server. From the server, I pulled all the code from my Github repo, some conflicts were found and I fixed, everything well until […]