Translations by Vibhav Pant
Vibhav Pant has submitted the following strings to this translation. Contributions are visually coded: currently used translations, unreviewed suggestions, rejected suggestions.
| 1 → 29 of 29 results | First • Previous • Next • Last |
| 5. |
A rebase operation was interrupted. Continue using 'bzr rebase-continue' or abort using 'bzr rebase-abort'
|
|
| 2012-01-13 |
A rebase operation was interrupted. Continue using 'bzr rebase-continue' or abort using 'bzr rebase-abort'
|
|
| 11. |
%d revisions will be rebased:
|
|
| 2012-01-13 |
%d revisions will be rebased:
|
|
| 12. |
A conflict occurred replaying a commit. Resolve the conflict and run 'bzr rebase-continue' or run 'bzr rebase-abort'.
|
|
| 2012-01-13 |
A conflict occurred replaying a commit. Resolve the conflict and run 'bzr rebase-continue' or run 'bzr rebase-abort'.
|
|
| 13. |
There are still conflicts present. Resolve the conflicts and then run 'bzr resolve' and try again.
|
|
| 2012-01-13 |
There are still conflicts present. Resolve the conflicts and then run 'bzr resolve' and try again.
|
|
| 14. |
No rebase to continue
|
|
| 2012-01-13 |
No rebase to continue
|
|
| 15. |
No rebase in progress
|
|
| 2012-01-13 |
No rebase in progress
|
|
| 16. |
Currently replaying: %s
|
|
| 2012-01-13 |
Currently replaying: %s
|
|
| 17. |
{0} -> {1}
|
|
| 2012-01-13 |
{0} -> {1}
|
|
| 18. |
--revision is mandatory
|
|
| 2012-01-13 |
--revision is mandatory
|
|
| 19. |
replaying commits
|
|
| 2012-01-13 |
replaying commits
|
|
| 20. |
No pull location known or specified.
|
|
| 2012-01-13 |
No pull location known or specified.
|
|
| 21. |
Using saved location: %s
|
|
| 2012-01-13 |
Using saved location: %s
|
|
| 22. |
Nothing to do.
|
|
| 2012-01-13 |
Nothing to do.
|
|
| 23. |
Re-base a branch.
|
|
| 2012-01-13 |
Re-base a branch.
|
|
| 24. |
Rebasing is the process of taking a branch and modifying the history so
that it appears to start from a different point. This can be useful
to clean up the history before submitting your changes. The tree at the
end of the process will be the same as if you had merged the other branch,
but the history will be different.
|
|
| 2012-01-13 |
Rebasing is the process of taking a branch and modifying the history so
that it appears to start from a different point. This can be useful
to clean up the history before submitting your changes. The tree at the
end of the process will be the same as if you had merged the other branch,
but the history will be different.
|
|
| 25. |
The command takes the location of another branch on to which the branch in
the specified directory (by default, the current working directory)
will be rebased. If a branch is not specified then the parent branch
is used, and this is usually the desired result.
|
|
| 2012-01-13 |
The command takes the location of another branch on to which the branch in
the specified directory (by default, the current working directory)
will be rebased. If a branch is not specified then the parent branch
is used, and this is usually the desired result.
|
|
| 26. |
The first step identifies the revisions that are in the current branch that
are not in the parent branch. The current branch is then set to be at the
same revision as the target branch, and each revision is replayed on top
of the branch. At the end of the process it will appear as though your
current branch was branched off the current last revision of the target.
|
|
| 2012-01-13 |
The first step identifies the revisions that are in the current branch that
are not in the parent branch. The current branch is then set to be at the
same revision as the target branch, and each revision is replayed on top
of the branch. At the end of the process it will appear as though your
current branch was branched off the current last revision of the target.
|
|
| 27. |
Each revision that is replayed may cause conflicts in the tree. If this
happens the command will stop and allow you to fix them up. Resolve the
commits as you would for a merge, and then run 'bzr resolve' to marked
them as resolved. Once you have resolved all the conflicts you should
run 'bzr rebase-continue' to continue the rebase operation.
|
|
| 2012-01-13 |
Each revision that is replayed may cause conflicts in the tree. If this
happens the command will stop and allow you to fix them up. Resolve the
commits as you would for a merge, and then run 'bzr resolve' to marked
them as resolved. Once you have resolved all the conflicts you should
run 'bzr rebase-continue' to continue the rebase operation.
|
|
| 28. |
If conflicts are encountered and you decide that you do not wish to continue
you can run 'bzr rebase-abort'.
|
|
| 2012-01-13 |
If conflicts are encountered and you decide that you do not wish to continue
you can run 'bzr rebase-abort'.
|
|
| 29. |
The '--onto' option allows you to specify a different revision in the
target branch to start at when replaying the revisions. This means that
you can change the point at which the current branch will appear to be
branched from when the operation completes.
|
|
| 2012-01-13 |
The '--onto' option allows you to specify a different revision in the
target branch to start at when replaying the revisions. This means that
you can change the point at which the current branch will appear to be
branched from when the operation completes.
|
|
| 30. |
Show what would be done, but don't actually do anything.
|
|
| 2012-01-13 |
Show what would be done, but don't actually do anything.
|
|
| 31. |
Don't skip revisions that merge already present revisions.
|
|
| 2012-01-13 |
Don't skip revisions that merge already present revisions.
|
|
| 32. |
Rebase pending merges onto local branch.
|
|
| 2012-01-13 |
Rebase pending merges onto local branch.
|
|
| 33. |
Different revision to replay onto.
|
|
| 2012-01-13 |
Different revision to replay onto.
|
|
| 34. |
Abort an interrupted rebase.
|
|
| 2012-01-13 |
Abort an interrupted rebase.
|
|
| 35. |
Continue an interrupted rebase after resolving conflicts.
|
|
| 2012-01-13 |
Continue an interrupted rebase after resolving conflicts.
|
|
| 37. |
Rebase revisions based on a branch created with a different import tool.
|
|
| 2012-01-13 |
Rebase revisions based on a branch created with a different import tool.
|
|
| 38. |
This will change the identity of revisions whose parents
were mapped from revisions in the other version control system.
|
|
| 2012-01-13 |
This will change the identity of revisions whose parents
were mapped from revisions in the other version control system.
|
|
| 39. |
You are recommended to run "bzr check" in the local repository
after running this command.
|
|
| 2012-01-13 |
You are recommended to run "bzr check" in the local repository
after running this command.
|
|
