Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Inform git that release branch does not diverge from main #55

Merged
merged 29 commits into from
Dec 4, 2024
Merged

Inform git that release branch does not diverge from main #55

merged 29 commits into from
Dec 4, 2024

Conversation

mliu-cloudera
Copy link
Collaborator

No description provided.

ewilliams-cloudera and others added 29 commits November 18, 2024 14:41
@ewilliams-cloudera
"wip on exception handling for reconciler deletes"
fc78f36
@jkwatson
"wip on ignoring 404s"
cdd41e7
@ewilliams-cloudera
"wip on rag file reconciler"
72482c4
@jkwatson
"finish file delete and summary"
856a143
@ewilliams-cloudera
minor language change to job status
436feb0
@ewilliams-cloudera
remove /index prefix
0c12d77
@jkwatson
"legacy amp update route"
80ecf87
@jkwatson
update JST test and display values
b49ec85
@actions-user
Update release version to dev-testing
70073ee
@ewilliams-cloudera
mark endpoints as deprecated
03c6b45
@jkwatson
"wip on moving python endpoints to better places"
21b7e0e
@ewilliams-cloudera
updating suggested questions
04dd9b1
@ewilliams-cloudera
remove unused
98a40f3
@jkwatson
Update scripts/release_version.txt
a11a1a9
@jkwatson
remove mis-committed file
bd3d2fc
@jkwatson
Merge pull request #21 from cloudera/mob/main
a595674 
Reconciler exception handling and updated python prefixes
@actions-user
Update release version to 1.2.0-beta
db351be
@ewilliams-cloudera
fix tests
ebce3e2
@ewilliams-cloudera
pytests
73ed970
@ewilliams-cloudera
update gha
195faf0
@ewilliams-cloudera
Update pr_build.yml
7b3e124
@ewilliams-cloudera
Update llm-service/app/tests/routers/index/test_data_source.py
94741a0
@ewilliams-cloudera
Merge pull request #23 from cloudera/elijah/pytest-ci
ec04760 
Pytest - Fix tests and add to GHA
@conradocloudera
Use pdm for llm-service deps (#24)
b0b009e 
* Use pdm for llm-service deps

* update github workflow

* use setup-pdm

* use quotes
@actions-user
Update release version to release-testing
b92350c
@jkwatson @ewilliams-cloudera
@mliu-cloudera @actions-user
MIsc. updates and bugfixes (#25)
83122e9 
* add scores to sources

* add in toggle for querying knowledge base

* wip for excluding knowledge base

* wip on llm_talk

* make direct calls to the CAII embedding model, rather than using the OpenAI library

* init the context in the super constructor call

* Fix check for CAII domain

* fix broken test compilation

* Update release version to dev-testing

* hide the knowledge base switch for now

---------

Co-authored-by: Elijah Williams <ewilliams@cloudera.com>
Co-authored-by: Michael Liu <mliu@cloudera.com>
Co-authored-by: actions-user <actions@github.com>
@actions-user
Update release version to 1.2.0
adbe37c
@mliu-cloudera
Update RELEASING.md
1c1db0f
@mliu-cloudera
Update refresh_project.sh
b69a383
jkwatson
jkwatson approved these changes Dec 4, 2024
View reviewed changes
Copy link
Collaborator

@jkwatson jkwatson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚢 🦑

@mliu-cloudera
Copy link
Collaborator Author

GitHub claims there's a diff.

I reject its reality and substitute my own.

@mliu-cloudera mliu-cloudera merged commit ff4ae90 into release/1 Dec 4, 2024
3 checks passed
@mliu-cloudera mliu-cloudera deleted the liu/git-outta-here branch December 4, 2024 21:13
@mliu-cloudera
Copy link
Collaborator Author

It worked!

So what happened was #26 squash-merged main into release/1. This caused git to no longer be able to discern the present-day diff between main and release/1 (because it appears to git as a divergence, not a merge), presenting massive merge conflicts in #53.

This PR performs a non-squash merge from the same commit merged in #26, which creates a merge commit with 0 diff (ff4ae90) (despite what this PR's "Files changed" claims because remember, we confused git) which lets git know that release/1's head was merged from main, which unblocks #53.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ewilliams-cloudera ewilliams-cloudera ewilliams-cloudera approved these changes

@jkwatson jkwatson jkwatson approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mliu-cloudera @jkwatson @ewilliams-cloudera @actions-user @conradocloudera