D
D
d999992021-08-20 11:17:26
git
d99999, 2021-08-20 11:17:26

GIT conflicts in files in the translations folder, how to avoid?

4 developers are constantly adding lines to transliteration files - due to the fact that this happens on the same lines = conflicts appear.
If a good solution under which there will be no conflicts?

Answer the question

In order to leave comments, you need to log in

2 answer(s)
B
BorLaze, 2021-08-20
@BorLaze

if the data is strictly on one line, sorting the file before pushing/pulling
will also help (or make it easier to manually resolve)

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question