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

squash merged the Andreas Moog changes excluding .gitlab-ci.yml #111

Merged
merged 2 commits into from
Jan 21, 2023
Merged

squash merged the Andreas Moog changes excluding .gitlab-ci.yml #111

merged 2 commits into from
Jan 21, 2023

Conversation

narc-Ontakac2
Copy link
Collaborator

@narc-Ontakac2 narc-Ontakac2 commented Jan 5, 2023

These are simply the squashed commits from #72 and a minor change to get the debuild going again.

@r00t-
Copy link
Collaborator

r00t- commented Jan 5, 2023

@narc-Ontakac2:
good that you're taking this on!

@r00t-
Copy link
Collaborator

r00t- commented Jan 5, 2023

@narc-Ontakac2:
i would word the commit message differently (can we just leave Andreas as the author of the squashed commit?)
other than that, i'd merge this immediately.

@r00t-
Copy link
Collaborator

r00t- commented Jan 17, 2023

@narc-Ontakac2:
many thanks.
to me, "(squashed) debian packaging changes" or "(squashed) changes from debian packaging repository" would appear to be the correct commit message. (as the action of merging is not the author's.) maybe even as the generic autogenerated merged commit message generated by git.
(i will try to get your added to the project so you can merge to master yourself as you see fit.)

@r00t-
Copy link
Collaborator

r00t- commented Jan 21, 2023

@narc-Ontakac2:
you should have access to merge this yourself now, and have my approval to do so, but consider my note above.

@narc-Ontakac2 narc-Ontakac2 merged commit 7cc80c5 into volkszaehler:master Jan 21, 2023
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.

3 participants