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

don't reset update time when no update was written to db #6005

Merged
merged 1 commit into from
Jun 26, 2024

Conversation

grnd-alt
Copy link
Member

@grnd-alt grnd-alt commented Jun 17, 2024

Checklist

  • Code is properly formatted
  • Sign-off message is added to all commits
  • Tests (unit, integration, api and/or acceptance) are included
  • Documentation (manuals or wiki) has been updated or is not required

Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>
@grnd-alt grnd-alt linked an issue Jun 17, 2024 that may be closed by this pull request
@grnd-alt grnd-alt requested a review from juliusknorr June 17, 2024 11:44
@juliusknorr juliusknorr merged commit 4b2c191 into main Jun 26, 2024
26 of 27 checks passed
@juliusknorr juliusknorr deleted the fix/5628-deck-card-descriptions-not-saved branch June 26, 2024 08:15
@grnd-alt
Copy link
Member Author

/backport to stable28

Copy link

backportbot bot commented Jun 26, 2024

The backport to stable28 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable28
git pull origin stable28

# Create the new backport branch
git checkout -b backport/6005/stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 3c5ca27e

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6005/stable28

Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout:
docs/index.md
Please commit your changes or stash them before you switch branches.
Aborting


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@grnd-alt
Copy link
Member Author

/backport to stable29

Copy link

backportbot bot commented Jun 26, 2024

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/6005/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 3c5ca27e

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6005/stable29

Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout:
docs/index.md
Please commit your changes or stash them before you switch branches.
Aborting


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@skjnldsv
Copy link
Member

/backport to stable29

Copy link

backportbot bot commented Jun 26, 2024

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/6005/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 3c5ca27e

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6005/stable29

Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout:
docs/index.md
Please commit your changes or stash them before you switch branches.
Aborting


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@grnd-alt
Copy link
Member Author

/backport to stable29

Copy link

backportbot bot commented Jun 26, 2024

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/6005/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 3c5ca27e

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6005/stable29

Error: Failed to clone repository: Failed to checkout branches: Updating 4b2c191..206a735
From https://github.com/nextcloud/deck

  • [deleted] (none) -> origin/fix/symlink
    error: Your local changes to the following files would be overwritten by merge:
    docs/index.md
    Please commit your changes or stash them before you merge.
    Aborting

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@juliusknorr
Copy link
Member

/backport to stable29

@grnd-alt
Copy link
Member Author

/backport to stable28

@grnd-alt
Copy link
Member Author

/backport to stable27

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

Successfully merging this pull request may close these issues.

Card description not saved when creating via "N" shortcut deck card descriptions sometimes are not saved
3 participants