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

Fix/aboutbox #79

Closed
wants to merge 5 commits into from
Closed

Fix/aboutbox #79

wants to merge 5 commits into from

Conversation

Pitterling
Copy link
Collaborator

update - url, author, license and tips label; make url clickable

@Pitterling
Copy link
Collaborator Author

Pitterling commented Apr 22, 2017

contribution.md is still missing and should be created before this PR gets merged

fixes #76


authorlabel.setText("Author: xavier cherif");
url ="https://github.com/vlsi/ksar/CONTRIBUTION.md";
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afaik, it should be CONTRIBUTING.md for proper GitHub integration: https://github.com/blog/1184-contributing-guidelines

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this is about "How to contribute " .. that's also missing.

For the moment I was more thinking on a list of contributors... e.g. antlr4 contributors. The current aboutbox just lists Xavier here as author..

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I get the idea.

CONTRIBUTORS.md might be better filename then.

@Pitterling
Copy link
Collaborator Author

@vlsi hmmm .. seems i somehow screwed the commits within the PR ... don't know if i can revert?

anyhow ... i changed the URL to CONTRIBUTORS.md and provide also the file.

@vlsi
Copy link
Owner

vlsi commented Apr 28, 2017

don't know if i can revert?

The idea is to push the proper changes to your fix/aboutbox branch.
For instance:

git checkout fix/aboutbox
git reset --hard 1bc595853a9b1f0b129b810dd1782d1b7f249cce   #    remove old implementation, delete superfluous classes
git push -f

Does that make sense?

@vlsi
Copy link
Owner

vlsi commented Apr 28, 2017

Note: ensure you have "contributors.md, etc changes" somewhere else before doing reset --hard.
Alternatively you can just add a tag to keep those commits for future reuse:

git checkout fix/aboutbox
git tag before_2017_04_28_aboutbox_reset
git reset --hard 1bc595853a9b1f0b129b810dd1782d1b7f249cce   #    remove old implementation, delete superfluous classes
git push -f

@Pitterling
Copy link
Collaborator Author

tried to rebase .. but it seems it is not a good idea during a PR. Did the reset and pushed the changes again. Please check the CONTRIBUTION.md file --> ok for you?

@Pitterling
Copy link
Collaborator Author

I messed this up. Merging errors .. at least for me unresolvable .. will create a new PR

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.

None yet

3 participants