InfiniTime icon indicating copy to clipboard operation
InfiniTime copied to clipboard

Update Date&Time settings label for "Date & Time"

Open ajira86 opened this issue 2 years ago • 1 comments

Proposal to update Date&Time label for issue #1746

image

ajira86 avatar Jun 26 '23 12:06 ajira86

Build checks have not completed. Possible reasons for this are:

  1. The checks need to be approved by a maintainer
  2. The branch has conflicts
  3. The firmware build has failed

github-actions[bot] avatar Jun 26 '23 13:06 github-actions[bot]

I'm OK with this change, thanks @ajira86 for your contribution!

I'm not sure why the CI is red for build-firmware, build-simulator and test-clang-tidy for such a small change. But since there's a conflict, I tried editing the PR by rebasing on main (since I'm suppose to have this privilege), but I honestly don't know how to make this right.

@ajira86 could you rebase you change on main so we can merge it? Or does anyone know how to correctly edit a PR from a contributor?

JF002 avatar Oct 27 '24 16:10 JF002

If the ajira has "repository maintainers can edit this PR" or whatever the option is turned on, you should be able to (force) push directly to their branch IIRC. To do that you just clone their branch as usual and then push onto it, my preferred workflow is to add it as a new remote

mark9064 avatar Oct 27 '24 16:10 mark9064

When I checkout the @ajira86 's branch, it's checked out as a detached head, so I'm not sure I can push it after I fix the conflict.

JF002 avatar Nov 04 '24 19:11 JF002

I've pushed it!

FintasticMan avatar Nov 04 '24 20:11 FintasticMan

@FintasticMan Thanks! :+1 I'll need to learn this feature from Github!

The action build-firmware failed because of the "/" in the branch name so that's not an issue. I'll merge it!

JF002 avatar Nov 04 '24 20:11 JF002