Level 102
Never commit on production. If there are changes there, you should remove those with git reset --hard
Now that you have commited on production, you might need to push, and pull locally. Start off seeing if reset fixes it the next time
Jan 15, 2023
1
Level 4
Git Merge Conflict repeat on production server
Hello Team, Sometimes, i get merge conflicts which repeat over and over again. Not on Localhost, only on production.
On Production server, git tells me there is merge conflict.
1. I fix the conflict file
2. git add <file>
3. git commit -m "my message"
4. git pull
Thats it! Now all is up to date.
But after my next GIt rebase, i get the same merge conflict again on production. I dont know why? If i look the specific file, there is no conflict there.
Please or to participate in this conversation.