• Login
  • Register
  • Dolphin Forums
  • Home
  • FAQ
  • Download
  • Wiki
  • Code


Dolphin, the GameCube and Wii emulator - Forums › Dolphin Emulator Discussion and Support › Support v
« Previous 1 ... 592 593 594 595 596 ... 1197 Next »

Trouble merging recent changes from GIT repo
View New Posts | View Today's Posts

Thread Rating:
  • 0 Vote(s) - 0 Average
  • 1
  • 2
  • 3
  • 4
  • 5
Thread Modes
Trouble merging recent changes from GIT repo
01-24-2014, 05:25 AM
#1
slmpika Offline
Member
***
Posts: 139
Threads: 1
Joined: Oct 2011
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
Find
Reply
01-24-2014, 06:27 AM
#2
degasus Offline
Developer
**********
Developers (Some Administrators and Super Moderators)
Posts: 1,828
Threads: 10
Joined: May 2012
Yeah, our cmake will update them and the result is also tracked by git. imo broken design Wink
Just use
git reset --hard
to reset them, after this, you can pull as usual.
Find
Reply
01-24-2014, 06:34 AM
#3
slmpika Offline
Member
***
Posts: 139
Threads: 1
Joined: Oct 2011
That works, thanks.
Find
Reply
« Next Oldest | Next Newest »


  • View a Printable Version
  • Subscribe to this thread
Forum Jump:


Users browsing this thread: 2 Guest(s)



Powered By MyBB | Theme by Fragma

Linear Mode
Threaded Mode