Commit & Merging Infrastructure #139
Merged
Conversation
This file contains 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
Closed
8 tasks
nelsonni
force-pushed
the
feature/custom-hooks
branch
from
b6f87cd to
acf9859
Compare
nelsonni
force-pushed
the
feature/custom-hooks
branch
from
ad812b7 to
def0616
Compare
nelsonni
force-pushed
the
feature/custom-hooks
branch
from
6ace4eb to
23dc4ba
Compare
nelsonni
force-pushed
the
feature/custom-hooks
branch
from
07ce257 to
b57baa2
Compare
nelsonni
force-pushed
the
feature/custom-hooks
branch
from
0437995 to
1c0ffd9
Compare
nelsonni
force-pushed
the
feature/custom-hooks
branch
2 times, most recently
from
398796c to
489f582
Compare
… from implementation
…atibility before merging
…ypes/fs-extra, @types/react, @types/react-dom, @types/react-loadable, @types/react-redux, diff, luxon, @testing-library/dom, @testing-library/jest-dom, @testing-library/react, @testing-library/react-hooks, @types/mock-fs, copy-webpack-plugin, electron, jest, ts-jest, ts-loader, typescript, uuid, and webpack dependencies
… changes for the git test suite
…eb, @electron-forge/maker-dmg, @electron-forge/rpm
nelsonni
force-pushed
the
feature/custom-hooks
branch
from
489f582 to
69c8281
Compare
jettseale
approved these changes
Dec 17, 2020
2 tasks
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.
Includes:
useBranchStatushook for evaluating whether any currently open cards are associated with a specificrepoandbranch, and whether those cards have been modified according to agit.statuscheck.runBuildfunction (from Impact Analysis #199):runBuildtobuildfunction.Promise<string>containing build error codes, instead ofPromise<void>.buildintoPromise-based asynchronous constructs.fs.copyFilefrom base repository location.MergeDialogcomponent for selecting local branches from known git repositories, and analyzing whether they can be merged.material-ui/core/styles/createStyles,material-ui/core/styles/makeStyles,material-ui/core/styles/withStyles, andmaterial-ui/core/styles/Theme..syn/directory to contain cloned repositories for testing merges.git.branchLogfunction for determining commit delta between two branches in the same repository.git.branchDifffunction for determining files modified (and a coarse status indicator for the type of change) between two branches in the same repository.git.mergefor both test merging (usingdryRunparameter flag) and actual merging.git.clonefor injecting local-only branch cloning functionality on top ofisomorphic-git/clone.Closes #69, closes #174, and closes #220.