|
7.
|
|
|
It is not possible to %s because you have unmerged files.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:174
|
|
8.
|
|
|
Fix them up in the work tree, and then use 'git add/rm <file>' ![](/@@/translation-newline)
as appropriate to mark resolution and make a commit.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Popravite ih u radnom stablu, pa onda koristite 'git add/rm <file>' ![](/@@/translation-newline)
prikladno da označite rješenje i napravite izvršenje.
|
|
Translated by
Ajdin Karahasanović
|
|
Reviewed by
Samir Ribić
|
|
|
|
Located in
advice.c:182
|
|
9.
|
|
|
Exiting because of an unresolved conflict.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:190
|
|
10.
|
|
|
You have not concluded your merge (MERGE_HEAD exists).
|
|
|
|
Niste zaljučili vaše spajanje (MERGE_head exists).
|
|
Translated by
ena micto
|
|
Reviewed by
Samir Ribić
|
|
|
|
Located in
advice.c:195 builtin/merge.c:1332
|
|
11.
|
|
|
Please, commit your changes before merging.
|
|
|
|
Molimo Vas da spasite promjene prije spajanja.
|
|
Translated by
Nihad Jamaković
|
|
Reviewed by
Samir Ribić
|
|
|
|
Located in
advice.c:197
|
|
12.
|
|
|
Exiting because of unfinished merge.
|
|
|
|
Izlaz uslijed nedovršenog spajanja.
|
|
Translated by
Nihad Jamaković
|
|
Reviewed by
Samir Ribić
|
|
|
|
Located in
advice.c:198
|
|
13.
|
|
|
Note: checking out ' %s '.
![](/@@/translation-newline)
You are in 'detached HEAD' state. You can look around, make experimental ![](/@@/translation-newline)
changes and commit them, and you can discard any commits you make in this ![](/@@/translation-newline)
state without impacting any branches by performing another checkout.
![](/@@/translation-newline)
If you want to create a new branch to retain commits you create, you may ![](/@@/translation-newline)
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b <new-branch-name>
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:130
|
|
14.
|
|
|
unrecognized whitespace option '%s '
|
|
|
|
neprepoznati razmak u opciji '%s '
|
|
Translated and reviewed by
Samir Ribić
|
|
|
|
Located in
apply.c:69
|
|
15.
|
|
|
unrecognized whitespace ignore option '%s '
|
|
|
|
neprepoznati razmak ignorira opcija '%s '
|
|
Translated by
Elma Sarajkic
|
|
Reviewed by
Samir Ribić
|
|
|
|
Located in
apply.c:85
|
|
16.
|
|
|
--reject and --3way cannot be used together.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:135
|