Please do not post a support request without first reading and following the advice in https://retropie.org.uk/forum/topic/3/read-this-first
Cant Update Retroarch
-
Im getting this error-
= = = = = = = = = = = = = = = = = = = = = Installing 'retroarch' : RetroArch - frontend to the libretro emulator cores - required by all lr-* emulators = = = = = = = = = = = = = = = = = = = = = retroarch/ retroarch/retroarch.cfg retroarch/share/ retroarch/share/man/ retroarch/share/man/man6/ retroarch/share/man/man6/retroarch-cg2glsl.6 retroarch/share/man/man6/retroarch.6 retroarch/share/pixmaps/ retroarch/share/pixmaps/retroarch.svg retroarch/share/doc/ retroarch/share/doc/retroarch/ retroarch/share/doc/retroarch/COPYING retroarch/share/doc/retroarch/README.md retroarch/share/applications/ retroarch/share/applications/retroarch.desktop retroarch/bin/ retroarch/bin/retroarch-cg2glsl retroarch/bin/retroarch retroarch/etc/ retroarch/etc/retroarch.cfg /opt/retropie/emulators/retroarch /home/pi = = = = = = = = = = = = = = = = = = = = = Configuring 'retroarch' : RetroArch - frontend to the libretro emulator cores - required by all lr-* emulators = = = = = = = = = = = = = = = = = = = = = Already on 'rpi' M Brighter-with_Contrast.glslp M README.md M bsnes_gamma_ramp.glslp M hq2x&lcd3x.glslp M hq2x.glslp M hq2x2.glslp M hq2x_lcd3x.glslp M hq2x_phosphor.glslp M hq2xwaterpaint.glslp M hq2xwaterpaintscanline.glslp M hq4x.glslp M hq4x_lcd3x.glslp M nedi.glslp M phosphor.glslp M shaders/2xScaleHQ.glsl M shaders/anaglyph-to-side-by-side.glsl M shaders/barrel-distortion.glsl M shaders/bsnes_gamma_ramp.glsl M shaders/color-mangler.glsl M shaders/crt-hyllian-sharpness-hack.glsl M shaders/dot.glsl M shaders/gamma.glsl M shaders/gamma2.glsl M shaders/gb-pass-0.glsl M shaders/gb-pass-1.glsl M shaders/gb-pass-2.glsl M shaders/gb-pass-3.glsl M shaders/gb-pass-4.glsl M shaders/hq2x.glsl M shaders/hq2x2.glsl M shaders/hq4x.glsl M shaders/image-adjustment.glsl M shaders/lanczos4.glsl M shaders/lcd-grid.glsl M shaders/lcd3x.glsl M shaders/phosphor-normalgamma.glsl M shaders/phosphor.glsl M shaders/pixellate.glsl M shaders/quilez.glsl M shaders/retro-v2.glsl M shaders/sharp-bilinear.glsl M shaders/snes-hires-blend.glsl M shaders/water.glsl M shaders/waterpaint-hicontrast.glsl M shaders/waterpaint-scanline.glsl M shaders/waterpaint.glsl M shaders/xbr-lv1-noblend.glsl M snes.glslp M snes2.glslp M snes_hq2x.glslp M snes_hq2xwaterpaint.glslp M snes_hq2xwaterpainthicontrast.glslp M snes_hq2xwaterpaintscanline.glslp M snes_lcd3x.glslp M snes_phosphor.glslp M snes_scanline.glslp M snes_waterpaint.glslp Your branch is behind 'origin/rpi' by 23 commits, and can be fast-forwarded. (use "git pull" to update your local branch) error: Your local changes to the following files would be overwritten by merge: Brighter-with_Contrast.glslp README.md bsnes_gamma_ramp.glslp hq2x&lcd3x.glslp hq2x.glslp hq2x2.glslp hq2x_lcd3x.glslp hq2x_phosphor.glslp hq2xwaterpaint.glslp hq2xwaterpaintscanline.glslp hq4x.glslp hq4x_lcd3x.glslp nedi.glslp phosphor.glslp shaders/2xScaleHQ.glsl shaders/anaglyph-to-side-by-side.glsl shaders/barrel-distortion.glsl shaders/bsnes_gamma_ramp.glsl shaders/color-mangler.glsl shaders/crt-hyllian-sharpness-hack.glsl shaders/dot.glsl shaders/gamma.glsl shaders/gamma2.glsl shaders/gb-pass-0.glsl shaders/gb-pass-1.glsl shaders/gb-pass-2.glsl shaders/gb-pass-3.glsl shaders/gb-pass-4.glsl shaders/hq2x.glsl shaders/hq2x2.glsl shaders/hq4x.glsl shaders/image-adjustment.glsl shaders/lanczos4.glsl shaders/lcd-grid.glsl shaders/lcd3x.glsl shaders/phosphor-normalgamma.glsl shaders/phosphor.glsl shaders/pixellate.glsl shaders/quilez.glsl shaders/retro-v2.glsl shaders/sharp-bilinear.glsl shaders/snes-hires-blend.glsl shaders/water.glsl shaders/waterpaint-hicontrast.glsl shaders/waterpaint-scanline.glsl shaders/waterpaint.glsl shaders/xbr-lv1-noblend.glsl snes.glslp snes2.glslp snes_hq2x.glslp snes_hq2xwaterpaint.glslp snes_hq2xwaterpainthicontrast.glslp snes_hq2xwaterpaintscanline.glslp snes_lcd3x.glslp snes_phosphor.glslp snes_scanline.glslp snes_waterpaint.glslp Please commit your changes or stash them before you merge. error: The following untracked working tree files would be overwritten by merge: 2xsal-level2-crt.glslp gba-color.glslp nds-color.glslp palm-color.glslp psp-color.glslp shaders/2xsal-level2.glsl shaders/color/gba-color-old.glsl shaders/color/gba-color.glsl shaders/color/nds-color.glsl shaders/color/palm-color.glsl shaders/color/psp-color.glsl shaders/color/vba-color.glsl shaders/dotmask.glsl shaders/scanline.glsl shaders/sharp-bilinear-scanlines.glsl shaders/sharp-bilinear-simple.glsl shaders/supereagle.glsl shaders/zfast_crt_curve.glsl shaders/zfast_crt_curve_vertical.glsl shaders/zfast_crt_standard.glsl shaders/zfast_crt_standard_vertical.glsl shaders/zfast_lcd_standard.glsl shaders/zfast_resources/zfast_iqlut.png shaders/zfast_resources/zfast_scanlut.png sharp-bilinear-2x-prescale.glslp sharp-bilinear-scanlines.glslp sharp-bilinear-simple.glslp vba-color.glslp zfast_crt_curve.glslp zfast_crt_curve_vertical.glslp zfast_crt_standard.glslp zfast_crt_standard_vertical.glslp zfast_lcd_standard.glslp Please move or remove them before you merge. Aborting Updating 2193096..d161a1b HEAD is now in branch 'rpi' at commit '2193096f8679c403f77cf8779a560e72e98dee67' xmb/monochrome/ xmb/monochrome/README.md xmb/monochrome/font.ttf xmb/monochrome/png/ xmb/monochrome/png/GCE - Vectrex.png xmb/monochrome/png/Sega - Dreamcast.png xmb/monochrome/png/Nintendo - Nintendo DS-content.png xmb/monochrome/png/Sega - Mega Drive - Genesis-content.png xmb/monochrome/png/Atari - Lynx-content.png xmb/monochrome/png/reload.png xmb/monochrome/png/Casio - PV-1000-content.png xmb/monochrome/png/CHIP-8-content.png xmb/monochrome/png/folder.png xmb/monochrome/png/RPG Maker 2003.png xmb/monochrome/png/netplay - iRoom.png xmb/monochrome/png/Nintendo - Nintendo DS Decrypted.png xmb/monochrome/png/Nintendo - Nintendo DS Decrypted-content.png xmb/monochrome/png/Nintendo - Nintendo 3DS.png xmb/monochrome/png/Casio - Loopy-content.png xmb/monochrome/png/Nintendo - Super Nintendo Entertainment System-content.png xmb/monochrome/png/room.png xmb/monochrome/png/Microsoft - MSX.png xmb/monochrome/png/Sinclair - ZX Spectrum +3-content.png xmb/monochrome/png/Bally - Astrocade.png xmb/monochrome/png/history.png xmb/monochrome/png/Tiger - Game.com-content.png xmb/monochrome/png/Sharp - X68000-content.png xmb/monochrome/png/Hartung - Game Master-content.png xmb/monochrome/png/image.png xmb/monochrome/png/Game.png xmb/monochrome/png/Nintendo - Nintendo 64.png xmb/monochrome/png/ChaiLove-content.png xmb/monochrome/png/MAME 2010-content.png xmb/monochrome/png/2048-content.png xmb/monochrome/png/MAME 2016.png xmb/monochrome/png/Game Park - GP32.png xmb/monochrome/png/Atari - 5200.png xmb/monochrome/png/SNK - Neo Geo Pocket.png xmb/monochrome/png/SNK - Neo Geo CD.png xmb/monochrome/png/VTech - CreatiVision.png xmb/monochrome/png/DOS.png xmb/monochrome/png/lakka.png xmb/monochrome/png/Coleco - ColecoVision-content.png xmb/monochrome/png/core-disk-options.png xmb/monochrome/png/Benesse - Pocket Challenge V2.png xmb/monochrome/png/database.png xmb/monochrome/png/Libretro - Pad.png xmb/monochrome/png/MAME 2003.png xmb/monochrome/png/core-infos.png xmb/monochrome/png/Sony - PlayStation.png xmb/monochrome/png/Atari - 7800-content.png xmb/monochrome/png/Watara - Supervision.png xmb/monochrome/png/Nintendo - Wii U-content.png xmb/monochrome/png/Nintendo - GameCube.png xmb/monochrome/png/Funtech - Super Acan.png xmb/monochrome/png/Dungeon Crawl Stone Soup.png xmb/monochrome/png/Atari - ST-content.png xmb/monochrome/png/Atari - Jaguar.png xmb/monochrome/png/MAME.png xmb/monochrome/png/Emerson - Arcadia 2001-content.png xmb/monochrome/png/loadstate.png xmb/monochrome/png/favorites-content.png xmb/monochrome/png/Sinclair - ZX Spectrum.png xmb/monochrome/png/MAME 2000.png xmb/monochrome/png/retroarch.png xmb/monochrome/png/core.png xmb/monochrome/png/Microsoft - MSX2.png xmb/monochrome/png/DOS-content.png xmb/monochrome/png/Atari - Jaguar CD.png xmb/monochrome/png/Sega - Saturn-content.png xmb/monochrome/png/default-content.png xmb/monochrome/png/Atari - Jaguar CD-content.png xmb/monochrome/png/Lutro.png xmb/monochrome/png/Handheld Electronic Game-content.png xmb/monochrome/png/wifi.png xmb/monochrome/png/Mattel - Intellivision.png xmb/monochrome/png/The 3DO Company - 3DO-content.png xmb/monochrome/png/Sega - Saturn.png xmb/monochrome/png/undo.png xmb/monochrome/png/RPG Maker 2000.png xmb/monochrome/png/NEC - PC Engine SuperGrafx-content.png xmb/monochrome/png/rename.png xmb/monochrome/png/Nintendo - Game Boy.png xmb/monochrome/png/pointer.png xmb/monochrome/png/Funtech - Super Acan-content.png xmb/monochrome/png/Uzebox-content.png xmb/monochrome/png/Sony - PlayStation-content.png xmb/monochrome/png/Mattel - Intellivision-content.png xmb/monochrome/png/MAME 2016-content.png xmb/monochrome/png/Sega - PICO.png xmb/monochrome/png/Neo Geo-content.png xmb/monochrome/png/Rick Dangerous.png xmb/monochrome/png/ScummVM.png xmb/monochrome/png/resume.png xmb/monochrome/png/Microsoft - XBOX 360-content.png xmb/monochrome/png/images.png xmb/monochrome/png/LeapFrog - Leapster Learning Game System.png xmb/monochrome/png/netplay - LAN Room.png xmb/monochrome/png/Commodore - VIC-20.png xmb/monochrome/png/settings.png xmb/monochrome/png/Commodore - 64-content.png xmb/monochrome/png/Atari - Jaguar-content.png xmb/monochrome/png/Nintendo - Sufami Turbo-content.png xmb/monochrome/png/SNK - Neo Geo-content.png xmb/monochrome/png/NEC - PC-98-content.png xmb/monochrome/png/DOOM-content.png xmb/monochrome/png/Microsoft - MSX-content.png xmb/monochrome/png/Microsoft - XBOX.png xmb/monochrome/png/Sony - PlayStation 4-content.png xmb/monochrome/png/Coleco - ColecoVision.png xmb/monochrome/png/Sony - PlayStation 2-content.png xmb/monochrome/png/Fairchild - Channel F.png xmb/monochrome/png/NEC - PC Engine CD - TurboGrafx-CD.png xmb/monochrome/png/Nintendo - Nintendo 64DD-content.png xmb/monochrome/png/Entex - Adventure Vision-content.png xmb/monochrome/png/Cave Story-content.png xmb/monochrome/png/Commodore - 64.png xmb/monochrome/png/RCA - Studio II-content.png xmb/monochrome/png/Sinclair - ZX 81-content.png xmb/monochrome/png/favorites.png xmb/monochrome/png/Amstrad - CPC-content.png xmb/monochrome/png/FFmpeg-content.png xmb/monochrome/png/key-hover.png xmb/monochrome/png/Handheld Electronic Game.png xmb/monochrome/png/Nintendo - Pokemon Mini-content.png xmb/monochrome/png/netplay - iRoom-locked.png xmb/monochrome/png/on.png xmb/monochrome/png/RCA - Studio II.png xmb/monochrome/png/netplay - rooms.png xmb/monochrome/png/Nintendo - Nintendo DSi-content.png xmb/monochrome/png/FFmpeg.png xmb/monochrome/png/RPG Maker 2003-content.png xmb/monochrome/png/clock.png xmb/monochrome/png/Amstrad - CPC.png xmb/monochrome/png/Nintendo - Switch.png xmb/monochrome/png/file.png xmb/monochrome/png/Sony - PlayStation 4.png xmb/monochrome/png/Benesse - Pocket Challenge V2-content.png xmb/monochrome/png/MAME 2003-content.png xmb/monochrome/png/Sega - Mega-CD - Sega CD.png xmb/monochrome/png/Nintendo - Nintendo DSi.png xmb/monochrome/png/Sony - PlayStation 3-content.png xmb/monochrome/png/Nintendo - Nintendo DS.png xmb/monochrome/png/Sega - Game Gear.png xmb/monochrome/png/Casio - Loopy.png xmb/monochrome/png/Sega - Game Gear-content.png xmb/monochrome/png/Fairchild - Channel F-content.png xmb/monochrome/png/netplay - rooms-locked.png xmb/monochrome/png/MAME-content.png xmb/monochrome/png/MrBoom-content.png xmb/monochrome/png/Coleco - ColecoVision ADAM.png xmb/monochrome/png/Sinclair - ZX Spectrum +3.png xmb/monochrome/png/Dungeon Crawl Stone Soup-content.png xmb/monochrome/png/key.png xmb/monochrome/png/Microsoft - XBOX 360.png xmb/monochrome/png/Bally - Astrocade-content.png xmb/monochrome/png/Game Park - GP32-content.png xmb/monochrome/png/Tomb Raider-content.png xmb/monochrome/png/Sony - PlayStation Vita-content.png xmb/monochrome/png/Sega - 32X-content.png xmb/monochrome/png/add-favorite.png xmb/monochrome/png/Nintendo - Family Computer Disk System-content.png xmb/monochrome/png/Bandai - WonderSwan-content.png xmb/monochrome/png/close.png xmb/monochrome/png/Sony - PlayStation Portable.png xmb/monochrome/png/MAME 2000-content.png xmb/monochrome/png/Uzebox.png xmb/monochrome/png/screenshot.png xmb/monochrome/png/Sony - PlayStation 3.png xmb/monochrome/png/achievement-list.png xmb/monochrome/png/Bandai - WonderSwan.png xmb/monochrome/png/VTech - V.Smile.png xmb/monochrome/png/Microsoft - XBOX One-content.png xmb/monochrome/png/Atari - 2600.png xmb/monochrome/png/Nintendo - Game Boy Color.png xmb/monochrome/png/Sega - SG-1000.png xmb/monochrome/png/Atari - ST.png xmb/monochrome/png/Nintendo - Game Boy Color-content.png xmb/monochrome/png/2048.png xmb/monochrome/png/Lutro-content.png xmb/monochrome/png/NEC - PC Engine - TurboGrafx 16.png xmb/monochrome/png/Nintendo - Game Boy Advance-content.png xmb/monochrome/png/Sega - Mega-CD - Sega CD-content.png xmb/monochrome/png/Nintendo - Satellaview.png xmb/monochrome/png/MAME 2010.png xmb/monochrome/png/Nintendo - Nintendo 64DD.png xmb/monochrome/png/Sega - Master System - Mark III.png xmb/monochrome/png/Hartung - Game Master.png xmb/monochrome/png/CHIP-8.png xmb/monochrome/png/VTech - CreatiVision-content.png xmb/monochrome/png/SNK - Neo Geo Pocket-content.png xmb/monochrome/png/GCE - Vectrex-content.png xmb/monochrome/png/savestate.png xmb/monochrome/png/Dinothawr-content.png xmb/monochrome/png/Nintendo - Nintendo 3DS-content.png xmb/monochrome/png/Tiger - Game.com.png xmb/monochrome/png/Nintendo - Nintendo Entertainment System.png xmb/monochrome/png/Nintendo - Super Nintendo Entertainment System.png xmb/monochrome/png/Sega - Master System - Mark III-content.png xmb/monochrome/png/Nintendo - Virtual Boy-content.png xmb/monochrome/png/Commodore - VIC-20-content.png xmb/monochrome/png/Nintendo - Nintendo 64-content.png xmb/monochrome/png/core-cheat-options.png xmb/monochrome/png/Entex - Adventure Vision.png xmb/monochrome/png/SNK - Neo Geo CD-content.png xmb/monochrome/png/SNK - Neo Geo Pocket Color.png xmb/monochrome/png/NEC - PC-98.png xmb/monochrome/png/Microsoft - MSX2-content.png xmb/monochrome/png/FB Alpha - Arcade Games.png xmb/monochrome/png/zip.png xmb/monochrome/png/music.png xmb/monochrome/png/SNK - Neo Geo.png xmb/monochrome/png/dialog-slice.png xmb/monochrome/png/Quake1.png xmb/monochrome/png/Sega - PICO-content.png xmb/monochrome/png/Commodore - Amiga-content.png xmb/monochrome/png/Coleco - ColecoVision ADAM-content.png xmb/monochrome/png/VTech - V.Smile-content.png xmb/monochrome/png/Atari - 7800.png xmb/monochrome/png/Atari - 2600-content.png xmb/monochrome/png/Nintendo - Game Boy Advance.png xmb/monochrome/png/NEC - PC Engine - TurboGrafx 16-content.png xmb/monochrome/png/Cave Story.png xmb/monochrome/png/Nintendo - Nintendo Entertainment System-content.png xmb/monochrome/png/Minecraft.png xmb/monochrome/png/Nintendo - GameCube-content.png xmb/monochrome/png/Epoch - Super Cassette Vision-content.png xmb/monochrome/png/MAME 2014-content.png xmb/monochrome/png/Atari - Lynx.png xmb/monochrome/png/Nintendo - New Nintendo 3DS-content.png xmb/monochrome/png/Quake1-content.png xmb/monochrome/png/setting.png xmb/monochrome/png/netplay - LAN Room-locked.png xmb/monochrome/png/Watara - Supervision-content.png xmb/monochrome/png/FB Alpha - Arcade Games-content.png xmb/monochrome/png/Sega - Mega Drive - Genesis.png xmb/monochrome/png/Nintendo - Wii.png xmb/monochrome/png/Nintendo - New Nintendo 3DS.png xmb/monochrome/png/Dinothawr.png xmb/monochrome/png/Nintendo - Sufami Turbo.png xmb/monochrome/png/battery-charging.png xmb/monochrome/png/subsetting.png xmb/monochrome/png/Nintendo - Family Computer Disk System.png xmb/monochrome/png/Nintendo - Pokemon Mini.png xmb/monochrome/png/Bandai - WonderSwan Color-content.png xmb/monochrome/png/Tomb Raider.png xmb/monochrome/png/LeapFrog - Leapster Learning Game System-content.png xmb/monochrome/png/Philips - Videopac+-content.png xmb/monochrome/png/Philips - Videopac+.png xmb/monochrome/png/Sony - PlayStation Portable-content.png xmb/monochrome/png/Sony - PlayStation Vita.png xmb/monochrome/png/musics.png xmb/monochrome/png/Microsoft - XBOX-content.png xmb/monochrome/png/arrow.png xmb/monochrome/png/Emerson - Arcadia 2001.png xmb/monochrome/png/MAME 2014.png xmb/monochrome/png/Nintendo - Game Boy-content.png xmb/monochrome/png/DOOM.png xmb/monochrome/png/Magnavox - Odyssey2-content.png xmb/monochrome/png/ChaiLove.png xmb/monochrome/png/NEC - PC-FX-content.png xmb/monochrome/png/Epoch - Super Cassette Vision.png xmb/monochrome/png/RPG Maker 2000-content.png xmb/monochrome/png/movie.png xmb/monochrome/png/Sharp - X68000.png xmb/monochrome/png/Minecraft-content.png xmb/monochrome/png/run.png xmb/monochrome/png/netplay.png xmb/monochrome/png/Sony - PlayStation 2.png xmb/monochrome/png/SNK - Neo Geo Pocket Color-content.png xmb/monochrome/png/Microsoft - XBOX One.png xmb/monochrome/png/The 3DO Company - 3DO.png xmb/monochrome/png/Sega - SG-1000-content.png xmb/monochrome/png/MrBoom.png xmb/monochrome/png/Game-content.png xmb/monochrome/png/add.png xmb/monochrome/png/Nintendo - Satellaview-content.png xmb/monochrome/png/Commodore - Plus-4-content.png xmb/monochrome/png/bg.png xmb/monochrome/png/Sega - Dreamcast-content.png xmb/monochrome/png/cursor.png xmb/monochrome/png/Atari - 5200-content.png xmb/monochrome/png/Commodore - Plus-4.png xmb/monochrome/png/default.png xmb/monochrome/png/movies.png xmb/monochrome/png/Bandai - WonderSwan Color.png xmb/monochrome/png/core-input-remapping-options.png xmb/monochrome/png/Nintendo - Switch-content.png xmb/monochrome/png/Rick Dangerous-content.png xmb/monochrome/png/Nintendo - Wii-content.png xmb/monochrome/png/Sega - 32X.png xmb/monochrome/png/Magnavox - Odyssey2.png xmb/monochrome/png/off.png xmb/monochrome/png/NEC - PC Engine SuperGrafx.png xmb/monochrome/png/Sinclair - ZX Spectrum-content.png xmb/monochrome/png/Casio - PV-1000.png xmb/monochrome/png/Nintendo - Wii U.png xmb/monochrome/png/core-shader-options.png xmb/monochrome/png/Nintendo - Virtual Boy.png xmb/monochrome/png/Neo Geo.png xmb/monochrome/png/NEC - PC-FX.png xmb/monochrome/png/ScummVM-content.png xmb/monochrome/png/Commodore - Amiga.png xmb/monochrome/png/battery-full.png xmb/monochrome/png/NEC - PC Engine CD - TurboGrafx-CD-content.png xmb/monochrome/png/Sinclair - ZX 81.png xmb/monochrome/png/core-options.png Copying new default configuration to /opt/retropie/configs/all/retroarch.cfg.rp-dist /home/pi Error running 'git pull' - returned 1
Anyone's got an idea fix ? thanks
-
looks like you imported a load of shaders that aren't in the retropie shader repo. you need to delete them for it to update.
-
@dankcushions
thanks it worked :)
Contributions to the project are always appreciated, so if you would like to support us with a donation you can do so here.
Hosting provided by Mythic-Beasts. See the Hosting Information page for more information.