feat: conflict detection UI enhancement #3352
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
xyc
reviewed
Jun 23, 2021
violetyao
commented
Jun 23, 2021
violetyao
commented
Jun 25, 2021
AnanyaJha
reviewed
Jul 2, 2021
| if (this._conflict.localLastModifiedDate) { | ||
| tooltipMessage += nls.localize( | ||
| 'conflict_detect_local_last_modified_date', | ||
| `${new Date(this._conflict.localLastModifiedDate).toLocaleString()}` |
There was a problem hiding this comment.
@violetyao Is this the format we landed on after the last conversation during parking lot?
There was a problem hiding this comment.
It's based on our slack discussion in this thread! I'll add this item to today's parking lot to double check the format.
|
@violetyao changes look good overall, will take another look at it once it's been rebased with the latest changes for conflict detection Current status of PR: Awaiting doc changes for conflict detection label. This is required for GA and will be merged after the label has been approved. |
jag-j
approved these changes
Jul 6, 2021
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.
What does this PR do?
This PR displays local and remote
LastModifiedDatefor each conflicting file as tooltip.What issues does this PR fix or reference?
@W-9164041@
Functionality Before
We did not display local and remote
LastModifiedDatefor each conflicting file.Functionality After