[Merged by Bors] - Fix merge tool not ignoring OS files #6187
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #6187 +/- ##
=======================================
Coverage 81.8% 81.8%
=======================================
Files 301 301
Lines 32605 32605
=======================================
+ Hits 26690 26692 +2
+ Misses 4184 4182 -2
Partials 1731 1731 ☔ View full report in Codecov by Sentry. |
poszu
reviewed
Jul 30, 2024
poszu
approved these changes
Jul 30, 2024
|
bors merge |
spacemesh-bors bot
pushed a commit
that referenced
this pull request
Jul 30, 2024
## Motivation The merge tool right now copies over all files in the identities directory (including files like `.DS_Store` and `desktop.ini`). Since those are likely to be present in both locations this can block the merge tool until they are manually deleted. This PR fixes this issue.
|
Build failed: |
|
bors merge |
spacemesh-bors bot
pushed a commit
that referenced
this pull request
Jul 30, 2024
## Motivation The merge tool right now copies over all files in the identities directory (including files like `.DS_Store` and `desktop.ini`). Since those are likely to be present in both locations this can block the merge tool until they are manually deleted. This PR fixes this issue.
|
Pull request successfully merged into develop. Build succeeded: |
spacemesh-bors
bot
changed the title
fasmat
added a commit
that referenced
this pull request
Jul 30, 2024
## Motivation The merge tool right now copies over all files in the identities directory (including files like `.DS_Store` and `desktop.ini`). Since those are likely to be present in both locations this can block the merge tool until they are manually deleted. This PR fixes this issue.
4 tasks
fasmat
added a commit
that referenced
this pull request
Jul 30, 2024
## Motivation The merge tool right now copies over all files in the identities directory (including files like `.DS_Store` and `desktop.ini`). Since those are likely to be present in both locations this can block the merge tool until they are manually deleted. This PR fixes this issue.
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.
Motivation
The merge tool right now copies over all files in the identities directory (including files like
.DS_Storeanddesktop.ini). Since those are likely to be present in both locations this can block the merge tool until they are manually deleted.This PR fixes this issue.
Description
The merge tool now only copies
*.keyfiles and ignores everything else present in theidentitiesfolder.Test Plan
TODO