use unique file names for conflict files (fixes #62)#123
Merged
Conversation
function to generate unique file names
wonder-sk
reviewed
Feb 28, 2022
Contributor
wonder-sk
left a comment
wonder-sk
left a comment
There was a problem hiding this comment.
Looks good, just few minor comments...
alexbruy
force-pushed
the
conflict_unique_names
branch
3 times, most recently
from
bc8b73f to
213afcf
Compare
alexbruy
force-pushed
the
conflict_unique_names
branch
from
213afcf to
ed53085
Compare
wonder-sk
approved these changes
Feb 28, 2022
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Apply new naming scheme for conflict files:
my data (conflicted copy, martin v10).gpkg- for full copy (when rebase fails)my data (edit conflict, martin v10).json- for list of edit conflicts upon rebase (always a JSON file)Fixes #62.