diff options
| author | Mohamed Zenadi <zeapo@users.noreply.github.com> | 2019-05-15 11:22:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-15 11:22:07 +0200 |
| commit | 064a3fad99d5852d50634a98023cb92c4a915606 (patch) | |
| tree | d99160440eed728662d588d547e7b05f5ebe749d /app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java | |
| parent | 127a8b8c8a10d9c93bfc7e91e94b4bcb252eddeb (diff) | |
| download | HardenedPass-064a3fad99d5852d50634a98023cb92c4a915606.tar.gz HardenedPass-064a3fad99d5852d50634a98023cb92c4a915606.zip | |
Allow the user to push local master to a new branch in case of conflict (#508)
* detect that we're in a detached head and show the message
* add a new way to clean local repo in case of failed rebase
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java b/app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java index 4e7f037d..266dd096 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java +++ b/app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java @@ -58,9 +58,9 @@ public class SyncOperation extends GitOperation { new AlertDialog.Builder(callingActivity). setTitle(callingActivity.getResources().getString(R.string.jgit_error_dialog_title)). setMessage("Error occured during the sync operation, " + + "\nPlease check the FAQ for possible reasons why this error might occur." + callingActivity.getResources().getString(R.string.jgit_error_dialog_text) - + errorMessage - + "\nPlease check the FAQ for possible reasons why this error might occur."). + + errorMessage). setPositiveButton(callingActivity.getResources().getString(R.string.dialog_ok), (dialogInterface, i) -> callingActivity.finish()).show(); } } |