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.

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

Problem resolving conflicts with YAML files. #109605

Closed
mlezcano1985 opened this issue Oct 28, 2020 · 2 comments
Closed

Problem resolving conflicts with YAML files. #109605

mlezcano1985 opened this issue Oct 28, 2020 · 2 comments
Assignees
Labels
info-needed Issue requires more information from poster

Comments

@mlezcano1985
Copy link

Hi. I have some problem try to resolve git conflicts with vscode and YAML files.
yaml_merge
.

@alexr00 alexr00 added the ~info-needed Issue requires more information from poster (with bot comment) label Oct 28, 2020
@joaomoreno
Copy link
Member

@github-actions github-actions bot locked and limited conversation to collaborators Dec 13, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
info-needed Issue requires more information from poster
Projects
None yet
Development

No branches or pull requests

4 participants
@joaomoreno @mlezcano1985 @alexr00 and others