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

Do not check l10n comments #1597

Merged
merged 1 commit into from
Nov 24, 2020
Merged

Do not check l10n comments #1597

merged 1 commit into from
Nov 24, 2020

Conversation

skjnldsv
Copy link
Contributor

@skjnldsv skjnldsv commented Nov 24, 2020

I'm sure we can survive without them

@skjnldsv skjnldsv force-pushed the fix/ignore-l10n-comments branch 5 times, most recently from a851d66 to 2207fee Compare November 24, 2020 08:37
@skjnldsv skjnldsv self-assigned this Nov 24, 2020
@skjnldsv skjnldsv added 3. to review Waiting for reviews enhancement New feature or request labels Nov 24, 2020
@skjnldsv skjnldsv marked this pull request as ready for review November 24, 2020 08:38
@skjnldsv skjnldsv force-pushed the fix/ignore-l10n-comments branch 2 times, most recently from 6a8811a to 9f79397 Compare November 24, 2020 08:39
@skjnldsv skjnldsv force-pushed the fix/ignore-l10n-comments branch from 9f79397 to a540895 Compare November 24, 2020 08:41
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv skjnldsv force-pushed the fix/ignore-l10n-comments branch from a540895 to 78e4a0d Compare November 24, 2020 08:41
Copy link
Contributor

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

😢

Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍

@PVince81 PVince81 merged commit 0062db7 into master Nov 24, 2020
@PVince81 PVince81 deleted the fix/ignore-l10n-comments branch November 24, 2020 09:07
@PVince81
Copy link
Contributor

/backport to stable2

@backportbot-nextcloud
Copy link

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

@PVince81
Copy link
Contributor

hah, I knew it....

@PVince81
Copy link
Contributor

@skjnldsv can you take care (as it was your PR) ? otherwise let me know if I should take over

@skjnldsv
Copy link
Contributor Author

Ah shit, I pushed to stable2

10:18 [admin@workstation] ~/git/nextcloud-vue% gcb stable2/backport/1597
fatal: cannot lock ref 'refs/heads/stable2/backport/1597': 'refs/heads/stable2' exists ; unable to create 'refs/heads/stable2/backport/1597'

I thought my branch creation was successful --"

@skjnldsv
Copy link
Contributor Author

Well, it's in now I suppose 🙄

@PVince81
Copy link
Contributor

ref afe0613

seems there's a conflict marker, can you solve it ?

@skjnldsv
Copy link
Contributor Author

let me remove the old files yes

@skjnldsv
Copy link
Contributor Author

#1598

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants