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

Remove unused products removed from Eclipse-Platform #4

Merged
merged 1 commit into from
Sep 23, 2023

Conversation

HannesWell
Copy link
Contributor

@merks
Copy link
Contributor

merks commented Sep 23, 2023

@HannesWell

I assume you have sufficient permission that can merge this yourself, right?

@HannesWell
Copy link
Contributor Author

HannesWell commented Sep 23, 2023

I assume you have sufficient permission that can merge this yourself, right?

Yes I do. Just wanted to give some time for comments. But since there were no objections in the initial PR and this is the logical consequence I assume its fine to submit this now.

@HannesWell HannesWell merged commit 4b94754 into eclipse-simrel:main Sep 23, 2023
@HannesWell HannesWell deleted the removeProducts branch September 23, 2023 12:51
@merks
Copy link
Contributor

merks commented Sep 23, 2023

I always use squash and merge, even with all my platform contributions.

image

I thought one had to explicitly allow it:

https://github.com/eclipse-simrel/.eclipsefdn/blob/23d35310a8f4c9ad29cfcfa3bca55260ad155224/otterdog/eclipse-simrel.jsonnet#L33

@HannesWell
Copy link
Contributor Author

Sorry when writing my remark about squash-and-merge I was actually focusing on something else and confused it with Create a merge commit.

I always use squash and merge, even with all my platform contributions.

Personally I prefer Rebased an merge, because Squash and merge uses an artificial Github Commiter:
grafik

@merks
Copy link
Contributor

merks commented Sep 23, 2023

Oh wow, you learn something new every day!

@jonahgraham
Copy link
Contributor

I prefer rebase and merge when the sequence of commits is already what I want to submit, but squash and merge is very useful to rewrite history so that we don't have "fix review comments" type commits in main history.

@jonahgraham
Copy link
Contributor

Thanks @HannesWell for pushing this through to completion.

@HannesWell
Copy link
Contributor Author

Btw. I also tested locally that with the current 4.30 I-builds exactly those removed products were marked as missing.

I prefer rebase and merge when the sequence of commits is already what I want to submit, but squash and merge is very useful to rewrite history so that we don't have "fix review comments" type commits in main history.

Yes I don't want to reflect the back and forth during development/review in the history, but I also don't like the Github-Committer and its mail (I somethimes even noticed that it uses a github-mail with a random number, which I assume is some sort of ID for my account). Therefore I usually do force-pushes and squash locally before doing the final submission.
If Squash-And-Merge would just use my Name and reqular mail address I would also use it.

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