|
|
8.
|
|
|
Fix them up in the work tree, and then use 'git add/rm <file>' 
as appropriate to mark resolution and make a commit. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:196
|
|
|
9.
|
|
|
Exiting because of an unresolved conflict.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:204
|
|
|
10.
|
|
|
You have not concluded your merge (MERGE_HEAD exists).
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:209 builtin/merge.c:1379
|
|
|
11.
|
|
|
Please, commit your changes before merging.
|
|
|
|
|
कृपया तुमचे बदल एकत्र करण्याआधी ताब्यात द्या
|
|
Translated and reviewed by
Vaibhav S Dalvi
|
|
|
|
Located in
advice.c:211
|
|
|
12.
|
|
|
Exiting because of unfinished merge.
|
|
|
|
|
पूर्णपणे एकत्र न झाल्यामुळे बंद करत आहे
|
|
Translated and reviewed by
Vaibhav S Dalvi
|
|
|
|
Located in
advice.c:212
|
|
|
13.
|
|
|
Note: checking out ' %s'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
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'
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:70
|
|
|
15.
|
|
|
unrecognized whitespace ignore option '%s'
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:86
|
|
|
16.
|
|
|
--reject and --3way cannot be used together.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:136
|
|
|
17.
|
|
|
--cached and --3way cannot be used together.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:137
|
