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

fix: push autoresolved merge conflict on backend automatically #13544

Merged
merged 4 commits into from
Sep 26, 2024
Merged

fix: push autoresolved merge conflict on backend automatically #13544

merged 4 commits into from
Sep 26, 2024

Conversation

Jondyr
Copy link
Member

@Jondyr Jondyr commented Sep 16, 2024 •
edited
Loading

Description

  • Added a push operation in case a merge conflict is resolved automatically when pushing changes from the frontend
  • FileSync is sent to frontend for each file changed during the push
    • Cache invalidation for this is not implemented for most files on the frontend
    • Adding a way to send an array of files to invalidate could prevent a burst of messages if many files are changed.

Related Issue(s)

Verification

  • Your code builds clean without any errors or warnings
  • Manual testing done (required)
  • Relevant automated test added (if you find this hard, leave it and we'll help out)

Documentation

  • User documentation is updated with a separate linked PR in altinn-studio-docs. (if applicable)

@github-actions github-actions bot added the solution/studio/designer Issues related to the Altinn Studio Designer solution. label Sep 16, 2024
@Jondyr Jondyr linked an issue Sep 16, 2024 that may be closed by this pull request
Automatically resolved merge conflicts on push to gitea cause local changes to get lost #13188
Closed
@github-actions github-actions bot added the quality/testing Tests that are missing, needs to be created or could be improved. label Sep 16, 2024
@Jondyr Jondyr marked this pull request as ready for review September 16, 2024 10:03
framitdavid
framitdavid requested changes Sep 17, 2024
View reviewed changes
Copy link
Collaborator

@framitdavid framitdavid left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work! But I had one small comment. 👏

...ests/GiteaIntegrationTests/RepositoryController/RepositoryControllerGiteaIntegrationTests.cs Outdated Show resolved Hide resolved
@wrt95 wrt95 merged commit 484f12a into main Sep 26, 2024
17 checks passed
@wrt95 wrt95 deleted the fix/resolve-deadlock-on-git-push-with-fastforward branch September 26, 2024 06:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@framitdavid framitdavid framitdavid approved these changes

@wrt95 wrt95 wrt95 approved these changes

Assignees
No one assigned
Labels
quality/testing Tests that are missing, needs to be created or could be improved. solution/studio/designer Issues related to the Altinn Studio Designer solution.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Automatically resolved merge conflicts on push to gitea cause local changes to get lost
3 participants
@Jondyr @framitdavid @wrt95