From c8df1da69af76ab0079b6484d8cd12d7088dc19d Mon Sep 17 00:00:00 2001 From: Eric Mc Sween Date: Wed, 31 Mar 2021 07:55:53 -0400 Subject: [PATCH] Merge pull request #3856 from overleaf/em-git-folder Helpful error when trying to merge .git folder with Github GitOrigin-RevId: 15e976b738e91d89a6dfe64833620b75070ff998 --- services/web/locales/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/services/web/locales/en.json b/services/web/locales/en.json index ff26e06a0f..56b42b5d3d 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -1332,6 +1332,7 @@ "continue_github_merge": "I have manually merged. Continue", "export_project_to_github": "Export Project to GitHub", "github_validation_check": "Please check that the repository name is valid, and that you have permission to create the repository.", + "github_git_folder_error": "This project contains a .git folder at the top level, indicating that it is already a git repository. The Overleaf Github sync service cannot sync git histories. Please remove the .git folder and try again.", "repository_name": "Repository Name", "optional": "Optional", "github_public_description": "Anyone can see this repository. You choose who can commit.",