因此,当我执行以下命令时:
git pull
我会得到:
error: Your local changes to the following files would be overwritten by merge:
app/code/local/NextBits/DependentCustomOptionsImage/Block/Adminhtml/Template/Edit/Tab/Options/Option.php
app/design/adminhtml/default/default/layout/dependentcustomoptionsimage.xml
Please, commit your changes or stash them before you can merge
这是我需要的两个文件。
我该如何拉取源代码而不覆盖这些文件?
或者我该如何保留这些文件,拉取更改并将它们还原回去?