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

Keep newline before private class member #20

Merged
merged 2 commits into from
Dec 13, 2022
Merged

Keep newline before private class member #20

merged 2 commits into from
Dec 13, 2022

Conversation

PLUS-RobertEhrenleitner
Copy link
Contributor

Keep newline before private class member. #15.
Since modifying the history of a publicly pushed Git branch is a horrible idea, I created an entirely new branch based on the current master.

@glensc
Copy link
Collaborator

glensc commented Dec 13, 2022

Since modifying the history of a publicly pushed Git branch is a horrible idea, I created an entirely new branch based on the current master.

wrong. git documentation speaks about doing that on the default branch. on an unmerged branch it's very common practice. and even recommended practice to tidy up commits until they are mergeable. GitHub finally even can show previous pushes in the UI. (GitLab has it for ages).

@PLUS-RobertEhrenleitner
Copy link
Contributor Author

Please be patient with me. It's my second contribution to GitHub. At work, we have the rule to modify the history of pushed branches only if we want to frustrate our team mates. I hope you can work with these pull requests now.

@glensc
Copy link
Collaborator

glensc commented Dec 13, 2022

Surely there are different workflows and policies and many different opinions there are :)

@glensc glensc merged commit 318fca0 into mrclay:master Dec 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants