Project

General

Profile

Actions
Copy link

Bug #2417

closed

Latest version can not be "git pulled" - error: Your local changes to the following files would be overwritten by merge

Added by Crazy Fin over 10 years ago. Updated over 10 years ago.

Status:
Invalid
Priority:
Normal
Assignee:
-
Category:
General
Target version:
-
Start date:
2014-10-24
Due date:
% Done:

0%

Estimated time:
Found in version:
v3.9.1949
Affected Versions:

Description

Updating 9c6b8c2..38f73e1
error: Your local changes to the following files would be overwritten by merge:
docs/docresources/epg.png
docs/html/dvr_autorec.html
docs/html/dvr_timerec.html
src/epggrab/module/eit.c
src/input/mpegts/linuxdvb/linuxdvb_frontend.c
src/input/mpegts/mpegts_input.c
src/input/mpegts/satip/satip_frontend.c
src/input/mpegts/tsdemux.c
src/parsers/parser_teletext.c
src/parsers/parsers.c
src/plumbing/tsfix.c
src/service.c
src/streaming.c
src/streaming.h
src/subscriptions.c
src/timeshift.c
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
docs/docresources/dvrautorecentries.png
docs/docresources/timeschedules.png
Please move or remove them before you can merge.
Aborting

Actions
Copy link

Also available in: Atom PDF