-
Type:
Bug
-
Resolution: Unresolved
-
Priority:
Low
-
None
-
Affects Version/s: 4.1.6
-
Component/s: Git
-
None
-
Minor
A conflict occurs when trying to rebase. After the conflict is resolved, the rebase process loops (waited for more than 30 minutes). If you interrupt the process, an error message appears without text. I copied the command from the process listing and executed in the console:
temoffey@MacBook-Air-Ahin humart-backend % git -c color.branch=false -c color.diff=false -c color.status=false -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree -c sequence.editor='/Applications/Sourcetree.app/Contents/Resources/stree_gri' -c core.editor='/Applications/Sourcetree.app/Contents/Resources/stree_gri' rebase --continue cat: /Users/temoffey/git/humart-backend/.git/rebase-merge/quiet: No such file or directory 2022-02-14 13:49:07.697 stree_gri[9755:226183] *** Terminating app due to uncaught exception 'NSInvalidArgumentException', reason: '*** -[__NSPlaceholderDictionary initWithObjects:forKeys:count:]: attempt to insert nil object from objects[1]' *** First throw call stack: ( 0 CoreFoundation 0x00007ff802fd26cb __exceptionPreprocess + 242 1 libobjc.A.dylib 0x00007ff802d34dce objc_exception_throw + 48 2 CoreFoundation 0x00007ff80308da67 _CFThrowFormattedException + 194 3 CoreFoundation 0x00007ff8030982d1 -[__NSPlaceholderDictionary initWithCapacity:].cold.1 + 0 4 CoreFoundation 0x00007ff802ee2723 -[__NSPlaceholderDictionary initWithObjects:forKeys:count:] + 251 5 CoreFoundation 0x00007ff802ee260e +[NSDictionary dictionaryWithObjects:forKeys:count:] + 49 6 stree_gri 0x0000000104e8e3b7 stree_gri + 13239 7 stree_gri 0x0000000104e8e9f6 stree_gri + 14838 8 dyld 0x00000002051f24fe start + 462 9 ??? 0x0000000000000003 0x0 + 3 ) libc++abi: terminating with uncaught exception of type NSException error: /Applications/Sourcetree.app/Contents/Resources/stree_gri died of signal 6 error: There was a problem with the editor '/Applications/Sourcetree.app/Contents/Resources/stree_gri'. Please supply the message using either -m or -F option. error: could not commit staged changes.