Please, commit your changes

Polar Bear

Polar Bear

Vu+ Newbie
Hi I got this messis
From git://code.vuplus.com/git/openvuplus
1d3234a..0e1e40b master -> origin/master
Updating 1d3234a..0e1e40b
error: Your local changes to the following files would be overwritten by merge:
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
Please, commit your changes or stash them before you can merge.

How to do this ? So i dont hat to build new git for all updates on enigma2 as VU+ is broken and nide fix efry time.

Regards Polar Bear
 
angelofsky1980

angelofsky1980

BlackHole Driver Specialist
Polar Bear said:
Hi I got this messis
From git://code.vuplus.com/git/openvuplus
1d3234a..0e1e40b master -> origin/master
Updating 1d3234a..0e1e40b
error: Your local changes to the following files would be overwritten by merge:
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
Please, commit your changes or stash them before you can merge.

How to do this ? So i dont hat to build new git for all updates on enigma2 as VU+ is broken and nide fix efry time.

Regards Polar Bear
Click to expand...

Have you made some modifications to the file enigma2.bb ?
If YES, please commit them and next retry to fetch again the changes from Vu+ git server that is NOT broken.
 
Polar Bear

Polar Bear

Vu+ Newbie
I hat do this to enigma2.bb

#DEPENDS += "opera-hbbtv"
#RDEPENDS_enigma2-plugin-extensions-hbbtv = "opera-hbbtv"

It dont compile whit out it so how do I commit them ?
 
angelofsky1980

angelofsky1980

BlackHole Driver Specialist
Polar Bear said:
I hat do this to enigma2.bb

#DEPENDS += "opera-hbbtv"
#RDEPENDS_enigma2-plugin-extensions-hbbtv = "opera-hbbtv"

It dont compile whit out it so how do I commit them ?
Click to expand...

I understand your needs but the git system detects the edit and needs to work with a "stable" version of file and not one in "edit" mode.
Commit your changes and re-pull from Vu+ git server
 
You must log in or register to reply here.
Top