--- Log opened Sun Oct 29 00:00:57 2017
00:37 -!- Horwitz [~mich1@p200300800E42B500022268FFFE64E7C4.dip0.t-ipconnect.de] has quit [Ping timeout: 255 seconds]
00:50 -!- Horwitz [~mich1@p200300800E518A00022268FFFE64E7C4.dip0.t-ipconnect.de] has joined #navit
00:50 -!- mode/#navit [+o Horwitz] by ChanServ
02:46 -!- noradtux [~noradtux@port-36013.pppoe.wtnet.de] has quit [Ping timeout: 255 seconds]
02:47 -!- noradtux [~noradtux@2a04:4540:8c01:5201:ec4:7aff:fe33:3dc1] has joined #navit
05:07 -!- xenos1984 [~xenos1984@22-164-191-90.dyn.estpak.ee] has joined #navit
08:44 #navit: < youte> i hate github
08:45 #navit: < youte> xD
08:49 #navit: < ilovekiruna> youte: why so?
08:53 #navit: < youte> i try ti push two icons... error error...
08:54 #navit: < youte> To https://github.com/youte62/navit
08:54 #navit: < youte> ! [rejected]          icon_dam -> icon_dam (non-fast-forward)
08:54 #navit: < youte> error: failed to push some refs to 'https://github.com/youte62/navit'
08:54 #navit: < youte> hint: Updates were rejected because the tip of your current branch is behind
08:54 #navit: < youte> hint: its remote counterpart. Integrate the remote changes (e.g.
08:54 #navit: < youte> hint: 'git pull ...') before pushing again.
08:54 #navit: < youte> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
08:56 #navit: < ilovekiruna> do you understand the error?
08:56 #navit: < youte> no i'm stupid :(
08:56 #navit: < ilovekiruna> I think i had such things before
08:58 #navit: < ilovekiruna> when you try to push sth to github or any remote git repo, you should be in the versions ahead of the ones on github
08:58 #navit: < ilovekiruna> if you for example edited sth on the github website while also working on your computer
08:58 #navit: < ilovekiruna> then the history of commits on both places is different
08:58 #navit: < ilovekiruna> but we want it to be same everywhere
08:59 #navit: < ilovekiruna> so as suggested by the hint, u first need to make a "git pull " with the remote repo on github
09:00 #navit: < ilovekiruna> that could be "git pull origin" if the remote repo is called like this
09:00 #navit: < youte> i try
09:00 #navit: < youte> the problem is always here
09:00 #navit: < ilovekiruna> first type "git remote"
09:00 #navit: < ilovekiruna> what does it give?
09:01 #navit: < youte> already up to date
09:01 #navit: < youte> wait
09:01 #navit: < youte> git remote -> origin
10:00 #navit: < ilovekiruna> sorry, got distracted
10:00 #navit: < ilovekiruna> did you try a git pull
10:00 #navit: < ilovekiruna> and then a git commit?
10:00 #navit: < ilovekiruna> i think it will ask you to first make a git merge
10:23 #navit: < youte> git merge first?
10:24 #navit: < ilovekiruna> yes
10:25 #navit: < youte> always error
10:34 #navit: < ilovekiruna> have u done pull first?
11:29 #navit: < youte> yes no work..
14:35 #navit: < jkoan> Hi Kazer, youte and ilovekiruna
14:36 #navit: < jkoan> Hi Number6, I found the Svn from the toolchain for wince, probably we can update it to newer gcc versions and build a own one ;)
16:03 -!- rdorsch [~rdo@mail.bokomoko.de] has quit [Read error: Connection reset by peer]
17:12 #navit: <@KaZeR> hi there
17:14 #navit: <@KaZeR> youte: i think that your error is caused by metalstrolch's forced push
17:14 #navit: <@KaZeR> forced push alter the history, that why usually we should avoid them. Ping me when you're around and we'll fix this
17:22 -!- rdo [~rdo@mail.bokomoko.de] has joined #navit
17:22 -!- rdo is now known as rdorsch
17:30 #navit: < youte> KaZeR, pm
17:42 #navit: <@KaZeR> ok
17:49 -!- youte [~youte@32.ip-37-187-37.eu] has quit [Remote host closed the connection]
17:55 -!- youte [~youte@32.ip-37-187-37.eu] has joined #navit
21:40 -!- xenos1984 [~xenos1984@22-164-191-90.dyn.estpak.ee] has quit [Quit: Leaving.]
--- Log closed Mon Oct 30 00:00:58 2017