Project

General

Profile

Bug #2966

'git pull' doesn't work because files are modified during compiling

Added by Alfred Zastrow over 9 years ago. Updated over 9 years ago.

Status:
Fixed
Priority:
Normal
Assignee:
-
Category:
General
Target version:
-
Start date:
2015-06-22
Due date:
% Done:

0%

Estimated time:
Found in version:
Master from today (22.06.2015)
Affected Versions:

Description

root@tvh:~/tvheadend# git pull
remote: Counting objects: 48, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 48 (delta 42), reused 46 (delta 40), pack-reused 0
Entpacke Objekte: 100% (48/48), Fertig.
Von https://github.com/tvheadend/tvheadend
69f4991..ec2c596 master -> origin/master
Aktualisiere 69f4991..ec2c596
error: Your local changes to the following files would be overwritten by merge:
intl/js/tvheadend.js.cs.po
intl/js/tvheadend.js.en_GB.po
intl/tvheadend.cs.po
intl/tvheadend.de.po
Please, commit your changes or stash them before you can merge.
Aborting

History

#1

Updated by Jaroslav Kysela over 9 years ago

  • Status changed from New to Fixed

It should be already resolved. These files are touched only when 'make intl' target is called.

Also available in: Atom PDF