fix: resolve merge conflicts from develop consolidation#65
Open
Goldokpa wants to merge 1 commit into
Open
Conversation
Resolves 6 conflict regions across auth.py, main.py, and pipeline.py from the develop→main single-trunk consolidation. Keeps dev bypass in auth, merges governance/flooding imports, fixes duplicate org param in predict_upload, adds missing numpy import, and adopts clean GEE production path (no synthetic fallbacks). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
cv_devdev bypass, removed duplicate commentorgparameter crash inpredict_upload, added missingnumpyimport, keptdict[str, Any]type annotationstorch.nn.Modulereturn type for ONNX flexibility, removed synthetic fallback logic in favor of clean GEE production pathTest plan
predict_uploadendpoint no longer crashes on import (duplicate param fix)FloodingAnalysisimport resolvedtorch.nn.Modulereturn type🤖 Generated with Claude Code