Skip to Content
This question has been flagged
1 Reply
1161 Views
Avatar
Jakob Krabbe

2023-01-27 10:51:11,113 2939 INFO None odoo\.service\.db:\ Create\ database\ `jakob`\. 
2023\-01\-27\ 10:51:13,670\ 2939\ ERROR\ None\ odoo\.service\.db:\ CREATE\ DATABASE\ failed: 
Traceback\ \(most\ recent\ call\ last\):
\ \ File\ "/usr/lib/python3/dist\-packages/odoo/service/db\.py",\ line\ 59,\ in\ _initialize_db
\ \ \ \ odoo\.modules\.db\.initialize\(cr\)
\ \ File\ "/usr/lib/python3/dist\-packages/odoo/modules/db\.py",\ line\ 40,\ in\ initialize
\ \ \ \ info\ =\ odoo\.modules\.load_information_from_description_file\(i\)
\ \ File\ "/usr/lib/python3/dist\-packages/odoo/modules/module\.py",\ line\ 337,\ in\ load_information_from_description_file
\ \ \ \ info\.update\(ast\.literal_eval\(pycompat\.to_text\(f\.read\(\)\)\)\)
\ \ File\ "/usr/lib/python3\.8/ast\.py",\ line\ 59,\ in\ literal_eval
\ \ \ \ node_or_string\ =\ parse\(node_or_string,\ mode='eval'\)
\ \ File\ "/usr/lib/python3\.8/ast.py", line 47, in parse
return compile(source, filename, mode, flags,
File "", line 27
<<<<<<< HEAD
^
SyntaxError: invalid syntax


* * * * *

I have a git merge error but the error message is not telling me where this error is located!

Avatar
Discard
Avatar
Ksolves India Limited (Odoo Gold Partner)
Best Answer

The specific error is a "SyntaxError: invalid syntax" which is caused by an issue '<<<<<<< HEAD' with the code on line 27 of the file. It's likely that there is a conflict between changes made to the file in different branches of your Git repository and '<<<<<<< HEAD' got left into the code without resolving the conflict. To resolve the issue, you will need to manually merge the conflicting changes, ensure that the syntax is valid, and commit the code again.

Avatar
Discard
Jakob Krabbe
Author

I repeat my question for you! "I have a git merge error but the error message is not telling me where this error is located!"

Jakob Krabbe
Author

"The git command: git reset HEAD~ will remove all files from staging from your last commit. Using the git command git stash, you can store your unsaved files."

https://komodor.com/learn/git-errors/