Fix typo in README #302

2022-03-05T16:47:02Z

pat-s commented

2022-03-05 16:47:02 +00:00

(Migrated from gitea.com)

I don't understand the reported merge conflict.

justusbunsi commented

2022-03-08 15:52:32 +00:00

(Migrated from gitea.com)

The merge conflict comes from an outdated code base. PR #200 got merged a few months ago and introduced markdown linting which also changed the accepted line length. ?

lunny commented

2022-03-14 13:24:37 +00:00

(Migrated from gitea.com)

Maybe it's a bug of Gitea. But anyway, could you try to rebase and force push to test if it's still there.

6543 commented

2022-03-14 15:25:20 +00:00

(Migrated from gitea.com)

@justusbunsi just hit the pull "update" button ...

justusbunsi commented

2022-03-20 10:25:34 +00:00

(Migrated from gitea.com)

@6543 Don't see this button. :D

@lunny It is an issue with the code base from this PR branch. I can reproduce the conflict when locally running git rebase. The line length change introduced line breaks at this very text block. Manually fixing the conflict locally and then force-pushing will help. (95% sure that this fixes the conflict for Gitea ?)

@6543 Don't see this button. :D @lunny It is an issue with the code base from this PR branch. I can reproduce the conflict when locally running `git rebase`. The line length change introduced line breaks at this very text block. Manually fixing the conflict locally and then force-pushing will help. (95% sure that this fixes the conflict for Gitea ?)

👍 2

pat-s commented

2022-03-21 07:33:18 +00:00

(Migrated from gitea.com)

Thanks @justusbunsi!

I rebased, Gitea still reports a conflict. Not sure if this is still a false-positive now?

Are we good to merge?

Thanks @justusbunsi! I rebased, Gitea still reports a conflict. Not sure if this is still a false-positive now? Are we good to merge?

justusbunsi (Migrated from gitea.com) approved these changes 2022-03-21 11:45:02 +00:00

luhahn (Migrated from gitea.com) approved these changes 2022-03-25 07:13:48 +00:00

techknowlogick commented

2022-03-25 18:29:26 +00:00

(Migrated from gitea.com)

I've just pushed these changes to README.md in master directly, will close this PR now.

Pull request closed

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: lunny/helm-chart#302