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

[NETBEANS-54] Module Review uihandler #15

Merged
merged 1 commit into from
Sep 30, 2017
Merged

[NETBEANS-54] Module Review uihandler #15

merged 1 commit into from
Sep 30, 2017

Conversation

ebarboni
Copy link
Contributor

package.html was not updated by the tools

@matthiasblaesing
Copy link
Contributor

The change looks good. If you squash these three commits together, the two commits
efd73df and 863393c will cancel each other out and so only the "real" change remains. This keeps the history clean.

@ebarboni
Copy link
Contributor Author

hi, not sure how to do that, I have no squash merge is for people with write access I guess.

@emilianbold
Copy link
Member

+1

@matthiasblaesing
Copy link
Contributor

@ebarboni There are two thinks I'd like to ask you:

  • Adjust your git settings to include a name and update the existing commits (see here: https://www.git-tower.com/learn/git/faq/change-author-name-email)
  • Rewrite the history to squash the two commit on CLI (for GUI support you need to look into the corresponding GUI): Checkout the branch that backs this PR, run git rebase -i HEAD~3, now an editor of your choosing is started, holding one row per commit (and some help info), there you can reorder the commits, remove commits and squash them. (I failed to do that on a checkout from your repository, as git cli requires identity information, that your commits are missing, see above)

@ebarboni
Copy link
Contributor Author

@matthiasblaesing thanks a lot for pointer on rebase. Hope its better now.

@matthiasblaesing
Copy link
Contributor

@ebarboni thank you, that looks much cleaner. I have one last point: The commit message should reference the tracking bug. You had that in the PR, but that message does not get merged into the history, so I suggest, that you update the commit message to something like:

[NETBEANS-54] Module Review uihandler

package.html was not updated by the tools

You can do this by switching back to the branch backing the PR, and running git commit --amend. You can then change the commit message. This changes the commit itself and then you can do another force push.

-change header for apache bad detection of the convert tool
@ebarboni
Copy link
Contributor Author

Done

@asfgit asfgit merged commit 0893608 into apache:master Sep 30, 2017
asfgit pushed a commit that referenced this pull request Sep 30, 2017
Changeset small enough not to need an ICLA

This closes #15
@matthiasblaesing
Copy link
Contributor

Merged - thank you!

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.

4 participants