+- Dolphin, the GameCube and Wii emulator - Forums (https://forums.dolphin-emu.org)
+-- Forum: Dolphin Emulator Discussion and Support (https://forums.dolphin-emu.org/Forum-dolphin-emulator-discussion-and-support)
+--- Forum: Support (https://forums.dolphin-emu.org/Forum-support)
+--- Thread: Trouble merging recent changes from GIT repo (/Thread-trouble-merging-recent-changes-from-git-repo)
Trouble merging recent changes from GIT repo - slmpika - 01-24-2014
I have currently built Dolphin 4.0-658. When I tried to pull the latest changes from master today, I get the error copied at the end of this post. I have not made any modifications to any files in ~/dolphin-emu, and I build in a separate ./Build folder, so I have no idea why local changes are being detected and what they are. Now, I could just stash these changes, and it probably wouldn't affect Dolphin since they are just translation files, but I would like to determine the root cause of the issue if possible to avoid any potential issues in the future. Does anyone have any idea what is going on?
steven@steven-All-Series:~/dolphin-emu$ git pull origin
Updating 287ac90..65121cf
error: Your local changes to the following files would be overwritten by merge:
Languages/po/ar.po
Languages/po/ca.po
Languages/po/cs.po
Languages/po/de.po
Languages/po/el.po
Languages/po/en.po
Languages/po/es.po
Languages/po/fa.po
Languages/po/fr.po
Languages/po/he.po
Languages/po/hu.po
Languages/po/it.po
Languages/po/ja.po
Languages/po/ko.po
Languages/po/nb.po
Languages/po/nl.po
Languages/po/pl.po
Languages/po/pt.po
Languages/po/pt_BR.po
Languages/po/ru.po
Languages/po/sr.po
Languages/po/sv.po
Languages/po/tr.po
Languages/po/zh_CN.po
Languages/po/zh_TW.po
Please, commit your changes or stash them before you can merge.
Aborting
RE: Trouble merging recent changes from GIT repo - degasus - 01-24-2014
Yeah, our cmake will update them and the result is also tracked by git. imo broken design
Just use
git reset --hard
to reset them, after this, you can pull as usual.
RE: Trouble merging recent changes from GIT repo - slmpika - 01-24-2014
That works, thanks.