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

Replaced HeadingTitle with DefaultTextStyle #78

Merged
merged 7 commits into from Jun 8, 2022
Merged

Replaced HeadingTitle with DefaultTextStyle #78

merged 7 commits into from Jun 8, 2022

Conversation

clragon
Copy link
Contributor

@clragon clragon commented Jun 7, 2022

fix #75

merge request #76 but without a breaking oversight.

cannot be merged into fix/delay-screen because of conflicts by the revert.

(sorry, I forgot a tiny change on a line and it caused the issue!)

@naoki0719
Copy link
Owner

Thank you for everything.

#73 and #76 changes included?
I'm thinking of merging them into a new branch, is that a problem?

@clragon
Copy link
Contributor Author

clragon commented Jun 8, 2022

I love to help.

Includes #73 and #76.
Can be merged into new branch.
Cannot be merged into fix/delay-screen (will conflict with revert commit).

You can see what is included in the commit tab of the merge request:
image

this merge request could have been merged into fix/delay-screen if you reset differently.
Revert commits make new commits and reverting revert commits does not work well.
I suggest for next time:

git reset head~x     # x is the amount of commits you want to discard
git push --force     # this rewrites the history of the remote branch

@naoki0719
Copy link
Owner

Thank you for your response.
We will discard the previous branch as is and merge it into the new branch to check.

Then sorry for the late response.
I fall asleep everyday😂

@naoki0719 naoki0719 changed the base branch from master to fix/delay-screen-next June 8, 2022 12:58
@naoki0719 naoki0719 merged commit 88c516f into naoki0719:fix/delay-screen-next Jun 8, 2022
@clragon clragon deleted the headingtext branch June 8, 2022 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Replace HeadingText with DefaultTextTheme
2 participants