Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

create conflict files #38

Closed
PeterPetrik opened this issue Jan 8, 2020 · 0 comments · Fixed by #42
Closed

create conflict files #38

PeterPetrik opened this issue Jan 8, 2020 · 0 comments · Fixed by #42
Assignees
@PeterPetrik
Labels
enhancement New feature or request
Milestone
0.8.0

Comments

@PeterPetrik
Copy link
Contributor

during rebase or apply changes operation, we have policy to automatically resolve even "unresolvable" conflicts (e.g. 2 different people modify same attribute of base feature). We should create conflict file in such cases so they know what was automatically resolved and for example manually add back some feature or so.
@PeterPetrik PeterPetrik added the enhancement New feature or request label Jan 8, 2020
@PeterPetrik PeterPetrik added this to the 0.8.0 milestone Jan 8, 2020
@PeterPetrik PeterPetrik self-assigned this Feb 5, 2020
PeterPetrik added a commit that referenced this issue Feb 5, 2020
@PeterPetrik
fix #38 create conflict files [API BREAK]
7f99222
@PeterPetrik PeterPetrik mentioned this issue Feb 5, 2020
Merged
PeterPetrik added a commit that referenced this issue Feb 6, 2020
@PeterPetrik
Merge pull request #42 from lutraconsulting/confict_file
5488195 
fix #38 create conflict files [API BREAK]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@PeterPetrik PeterPetrik

Labels
enhancement New feature or request
Projects
None yet
Milestone
0.8.0
Development

Successfully merging a pull request may close this issue.

fix #38 create conflict files [API BREAK] MerginMaps/geodiff
1 participant
@PeterPetrik