有时候你改过代码就会这样,但应该怎么选?
XML/HTML代码
- y - discard changes and apply the update
- n - abort the update and let you manually clean things up
- v - view modified files
- d - view local modifications (diff)
- s - stash changes and try to reapply them after the update
如果没什么大问题,或者当时只是为了debug的,直接选y吧