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

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

Merged
merged 1 commit into from
Nov 4, 2024

Conversation

ajira86
Copy link
Contributor

@ajira86 ajira86 commented Jun 26, 2023

Proposal to update Date&Time label for issue #1746

image

@ajira86 ajira86 force-pushed the feature/date_and_time_label branch 2 times, most recently from 4623463 to 4876860 Compare June 26, 2023 13:02
@github-actions
Copy link

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

@FintasticMan FintasticMan added the UI/UX User interface/User experience label Jul 13, 2023
@NeroBurner NeroBurner added this to the 1.15.0 milestone Oct 3, 2024
Copy link
Contributor

@NeroBurner NeroBurner left a comment

Choose a reason for hiding this comment

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

Minimal change. Looks good. A rebase and conflicts resolved would be nice

@JF002
Copy link
Collaborator

JF002 commented Oct 27, 2024

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?

@mark9064
Copy link
Member

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

@JF002
Copy link
Collaborator

JF002 commented Nov 4, 2024

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.

@FintasticMan
Copy link
Member

I've pushed it!

@JF002
Copy link
Collaborator

JF002 commented Nov 4, 2024

@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 JF002 merged commit afeded0 into InfiniTimeOrg:main Nov 4, 2024
5 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
UI/UX User interface/User experience
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants