2
After much in the life of programming break the head doing FTP to update the system that is running in production, I decided to adopt as default the use of GIT
.
When I have a new update tested, I do a git pull
in the production application directory. It’s easier that way, and what I would do with 20 minutes or more do with 2 seconds.
But a concern arose: What if when I give one git pull
, der the famous "Merge Conflict" in the archives?
I started searching the Internet if there was any way to make a git pull
, forcing to modify the files for the last update, without having "merge Conflicts" problems, but I didn’t find much (maybe because I don’t know what to search in English).
I don’t know if that’s relevant, but obviously, the files in production aren’t altered. Even so, a conflict could not occur precisely in production.
Someone knows a way to make one git pull
, but without giving conflict? It is possible this?
So it is someone who is doing khda and editing the files in production, heheheh. + 1
– Wallace Maxters