|
|
26.
|
|
|
Cannot pull individual files
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
commands.py:172
|
|
|
27.
|
|
|
Can't merge. Nothing to do
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
commands.py:182
|
|
|
28.
|
|
|
This merge caused conflicts
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
commands.py:186
|
|
|
29.
|
|
|
Bazaar error merging from %s
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
commands.py:189
|
|
|
30.
|
|
|
Error. You have to enter a merge location.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
commands.py:193
|
|
|
31.
|
|
|
Overwrite remote branch
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
commands.py:208 commands.py:274
|
|
|
32.
|
|
|
Pull from parent
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
commands.py:211
|
|
|
33.
|
|
|
Enter the location from where you want to pull code
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
commands.py:211
|
|
|
34.
|
|
|
Pulling...
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
commands.py:236
|
|
|
35.
|
|
|
Bazaar error pulling from %s
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
commands.py:256
|
