Ask your questions here.
Post a reply

Hello from Versailles in France!

Sat Feb 18, 2012 10:49 pm

I'm testing your nice distro and my English writing is not as good as I would like...

But, practically everything is now in French and I am very interested by your "Refracta Snapshot" solution!

I don't know what to do after I launch: "git pull origin master"; I got a strange message I don't know how to handle:
"From git://github.com/fsmithred/refracta
* branch master -> FETCH_HEAD
Updating 279c6b3..0c44ce9
error: Your local changes to 'set-selections.sh' would be overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge."

Do you have a work around to help me?

Anyway, thank you a lot for your work!

;)

Re: Hello from Versailles in France!

Sun Feb 19, 2012 3:22 am

I am shooting in the dark, git is quite difficult to me.
What i would try is
Code:
cp set-selections.sh ~/Temp

(which means: backup the changed file set-selections in case you need the changed version.
You could also backup the whole directory somewhere, sure)
Code:
then run

git stash
and then try again
Code:
git pull origin master


If that fails you could simply do a fresh clone in a different directory:
Code:
git clone git://github.com/fsmithred/refracta

For someone like me starting from scratch with git can be the most easy solution.

Re: Hello from Versailles in France!

Sun Feb 19, 2012 12:10 pm

cp set-selections.sh ~/Temp
git stash
git pull origin master

Thanks Nadir!

The first part of your post did the repair and at the same time -at last- "sudo" is working correctly!?!?

I have to try to understand the the basics of "git" stuff...

;)

Re: Hello from Versailles in France!

Mon Feb 20, 2012 6:16 pm

Greetings from England AlbatroZ, good to see more international users. If you're using one of the newer "Uploaded daily (weekly?) builds", hopefully the new language/locale boot scripts are working well for you.

Global sudo is enabled by default for the "live user" but optional in a proper installation, (most Debian users like sudo configured manually, selectively or not at all)

Re: Hello from Versailles in France!

Wed Feb 22, 2012 9:15 pm

Same problem for me:
learning git is a project rather of years than of months. :-)

Re: Hello from Versailles in France!

Thu Feb 23, 2012 12:02 am

dzz wrote:Greetings from England AlbatroZ, good to see more international users. If you're using one of the newer "Uploaded daily (weekly?) builds", hopefully the new language/locale boot scripts are working well for you.

Global sudo is enabled by default for the "live user" but optional in a proper installation, (most Debian users like sudo configured manually, selectively or not at all)


Thanks Dzz for the informations!

For "sudo", I don't remember exactly how I did it and if it's an "orthodox" way... May be simply with the "adduser xxxx sudo" instruction?

"Refracta" is fun to use and the "iceweasel" tweaks are very new for me and I am testing the "snapshot" option; I use also SalineOS (with Remastersys) and Archlinux distros (ArchBang, Bridge-Linux, KahelOS and the Arch-Lemur test CD).

It's difficult for me to choose between SalineOS and Refracta...


;)
Post a reply