Our team recently switched to git.
We have a production web application server with slight code changes.
- ultra hot fixes specific to this installation
- some debugging statements for those errors that cannot be reproduced in our test environment
I think we can not pass them in the server repo.
When we had svn update, either merged the modified file or not merged. Now
git stash; git pull; git stash pop
doing the trick for me
How can I automatically detect cases when it git stash popcauses conflicts
broken working copy?
I want to send mail to resolve these cases manually
until they meet likebe advised, pull cancelled (conflicts)
source
share