-
Bug
-
Resolution: Duplicate
-
Low
-
None
-
1.5.2
-
None
-
Windows 7 professional SP1
using embeded git 1.8.3
I am in the middle of resolving conflicts in a rebase. I hit "ctrl+shift+C" to 'commit' and then select the option to "continue rebase". It then brings up the dialog showing the git command running, and sits there for about 5 full seconds before showing the error as captured in screenshot.
The error is: error: There was a problem with the editor ''C:\Program Files (x86)\Atlassian\SourceTree\stree_gri''.
The file "C:\Program Files (x86)\Atlassian\SourceTree\stree_gri" exists.
There are two files staged and no changes unstaged (see second screenshot).
When I copy/paste the command directly into the command line, I get the same error. If I try selecting "actions > continue rebase" I get the same result.
- is duplicated by
-
SRCTREEWIN-6206 Interactive rebase operations frequently fail
- Closed