gunnvorwagner wrote:If I download from the links you provided, will I still be able to git pull?
If you install GoldenDict via my repository on build.opensuse.org then GoldenDict will be installed into /usr/bin/goldendict.
You will be able to build GoldenDict from sources as well. You would just end up with two different GoldenDict versions and could use both. But I agree that it is simpler to have a single version.
If you are OK building from sources, I'd recommend to stick with that approach, since that way you will be able to upgrade to whatever latest version any time you wish.
gunnvorwagner wrote:error: Your local changes to the following files would be overwritten by merge:
hotkeywrapper.cc
That means you have local changes to that file. Just remove them via:
- Code: Select all
git checkout hotkeywrapper.cc