I can do svn status -u to get a list of all the changes. But I am leery of doing an update right away, when I am in the middle of something and I don't know if the change that I get will mess up my code.
At the very least I would like to know what files will be automatically merged. So I can go examine them after an update.
Will looking at svn status -u for files with first column M (locally modified) and a * (newer version exists in subversion repo) give me what I want ?
What do you do for this ?
See this Update from svn without merging automatically
Basically you need to provide a diff script that always return false, which marks all locally changed files as conflicted
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With