From 064a3fad99d5852d50634a98023cb92c4a915606 Mon Sep 17 00:00:00 2001 From: Mohamed Zenadi Date: Wed, 15 May 2019 11:22:07 +0200 Subject: 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 --- app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java') 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(); } } -- cgit v1.2.3