S
S
sandrain2014-04-11 18:42:14
Django
sandrain, 2014-04-11 18:42:14

Django-rosetta and git, how to make them friends?

The question is as follows:
There is an application that allows you to change po and mo files for translations through the interface.
The site is on the server, work is constantly being done on this site, the code is being changed using Git.
It turns out that the person who translates it through the interface on the server changes these files, and the developer overwrites them with his own, pushing to the server from the local machine.
The first thing that comes to mind is to ignore?
Are there any other options? Commit on the server and make a pool for the developer, but this is not necessary, and the developer can forget.

Answer the question

In order to leave comments, you need to log in

2 answer(s)
R
rsludge, 2014-04-11
@rsludge

as an option - write a pre-push hook that would check the differences in the files on the server and in the repository

Y
Yuri Shikanov, 2014-04-12
@dizballanze

Ignore them and that's all, there can be no other options here.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question