Flip merge command #1220
Draft
Flip merge command #1220
Conversation
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
* runtime: support first-class start key * drop requirement for top level workflow key * project: refactor support for the start key * fix tests * fix an issue where input path isn't parsed correctly * cli: suppress adaptor warning when running a yaml file * new tests for running yaml files * fix more tests * handle options on a non-nested workflow yaml
* allow workflow to be executed directly through workspace * types * remove default job.js * changeset * integration test * another integration test * support credentials on workspace config * remove mock * project: better handling of start in workflow.yaml * apply credentials map * add integration test for execute + credetial map * fix test * remove unused test * format * go deep on input tests * throw if workflow not found * project: fix an issue loading alias for a v1 project * update v1 integration test * fix integration test * better credential map handling * fix test It was secretly failing all along * ensure collections and credential map can both be set * changesets * test tweak * more integration test tweaks * fix integration tests yet again Turns out test order is important, so it was passing with .only but failing en masse * change v2 test order * let -> const * update v2 test configuration uuids as numbers break things * yet another test fix
Collaborator
Author
|
merge only updates the workign tree right? It doesn't push the project file or anything,. So if I'm on staging, and I do That's why pulling into your branch felt better. But you're in a wierd no-man's land because after merge, your local file system has sort of diverged from all remote targets, until you push. Will have to come back to this with a fresh mind tomorrow |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #1219
This basically flips the merge command.
Right now its
merge source, which pulls the source project into what's checked out.This PR makes it
merge target, which pushes the local project into whichever you want.AI Usage
Please disclose how you've used AI in this work (it's cool, we just want to know!):
You can read more details in our Responsible AI Policy