search

mt7180 / quaigle

RAG-based LLM application: project to explore different llm-frameworks like llamaindex, marvin and langchain, other used frameworks: streamlit, fastapi
1 stars 1 forks source link

wip: add qa route, engine answers but does not access text #24

Closed mt7180 closed 1 year ago

mt7180 commented 1 year ago

opened a new pull request for branch 17, since it was closed/ merged accidentally (without any new content)

mt7180 commented 1 year ago

pull request ready to merge from my perspective, besides the fact, that there are merge conflicts which I will have to resolve.

Zaubeerer commented 1 year ago

Do you know how to resolve merge conflicts?

You need to locally "pull from main". That will result in conflicts, that you can resolve in VS Code.

Finally, you create a merge commit, push to the remote repository and then the pull request should not complain anymore.

See for example this video: https://www.youtube.com/watch?v=KuB6hYoLozw

mt7180 commented 1 year ago

Thank you for the hint, I am able to resolve locally in VS Code, so I will try it as you suggested!