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

Merge conflict main/develp #203

Open
nichtich opened this issue Jun 20, 2024 · 0 comments
Open

Merge conflict main/develp #203

nichtich opened this issue Jun 20, 2024 · 0 comments

Comments

@nichtich
Copy link
Collaborator

nichtich commented Jun 20, 2024

Hungarian translation has been added to both main branch and develop branch independently, so branches cannot be merged. Edit should never be done on the main branch.

Use case: Docker image https://github.com/pkiraly/qa-catalogue/pkgs/container/qa-catalogue used main branch of qa-catalogue-web, so its web interface cannot be updated (it's broken at the moment, the fix is only on the develop branch of qa-catalogue-web).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant