diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg <Tim@web> | 2013-10-13 08:56:02 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2013-10-13 08:56:02 +0000 |
| commit | 15e271b9772a71661f462049a284c6fa14848404 (patch) | |
| tree | ebe294e7e48ed9fe885dd87efd7e910b1b0421e1 | |
| parent | db8f9e89bdd070986bab753957eac13f956fb0cf (diff) | |
| -rw-r--r-- | doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn index 9c315b8dc..245def940 100644 --- a/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn +++ b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn @@ -1,7 +1,7 @@ ### Please describe the problem. Data loss due to incorrect merge of repos in direct mode. -Given 2 repos A and B, in direct mode, where a has no remotes and b has a as remote (not sure if the latter is relevant): +Given 2 repos A and B, in direct mode: 1. in A: mkdir f, with a file f in it 2. in B: touch f 3. in B: sync |