Adds stats for when a merge is completed/aborted after a merge conflict #5742
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
Co-Authored-By: William Shepherd <iamwillshepherd@users.noreply.github.com>
iAmWillShepherd
changed the base branch from
master
to
show-resolved-conflicts
iAmWillShepherd
commented
Sep 25, 2018
app/src/lib/stores/app-store.ts
Outdated
| const inAConflictedMerge: boolean = [...status.workingDirectory.files].some( | ||
| file => file.status === AppFileStatus.Resolved || file.status === AppFileStatus.Conflicted | ||
| ) | ||
| const prevouslyInAConflictedMerge = false |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
I've merged #5715 into the base branch for this PR, and it looks like some commits here overlap with that - are we able to tidy up this PR to focus on just the new changes? |
iAmWillShepherd
changed the base branch from
show-resolved-conflicts
to
master
iAmWillShepherd
changed the base branch from
master
to
show-resolved-conflicts
iAmWillShepherd
changed the base branch from
show-resolved-conflicts
to
master
iAmWillShepherd
changed the base branch from
master
to
show-resolved-conflicts
iAmWillShepherd
changed the base branch from
show-resolved-conflicts
to
show-pr
Co-Authored-By: William Shepherd <iamwillshepherd@users.noreply.github.com>
This is necessary because some non-standard git terminology was introduced.
|
Closed in favor of #5810 |
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 #5394
At the moment, all the functions are in place to record the updates, but @outofambit and I were having some trouble getting to the right state. We'd like to be able to inspect the previous state so we can compare against the new state, so we did some programming by wishful thinking and just made up some variables that stand in for the real deal.