search

sugarlabs / sugar-toolkit-gtk3

Sugar Learning Environment, Activity Toolkit, GTK 3.
GNU Lesser General Public License v2.1
21 stars 80 forks source link

Write docs for sugar3.graphics.style #284

Closed ndefilippis closed 8 years ago

samdroid-apps commented 8 years ago

Looks good!

What indent were you using though? The docs should be indented the same as the code in the function. We use 4 space tabs.

Also, did you find the doc generator listed all of the constants?

Please squash all of your commits into 1.

ndefilippis commented 8 years ago

I couldn't get the doc generator to work, but looking at http://doc.sugarlabs.org/epydocs/ , the constants were included. Goutam Nair said that the constants are self-explanatory, so I shouldn't need to document them all.

samdroid-apps commented 8 years ago

Great. Please squash all of the commits into 1.

ndefilippis commented 8 years ago

How do I do that?

samdroid-apps commented 8 years ago

See the git rebase instructions here: https://developer.sugarlabs.org/contributing.md.html (under sending a pull request)

ndefilippis commented 8 years ago

Did that work?

samdroid-apps commented 8 years ago

no :(

samdroid-apps commented 8 years ago

Maybe git reset --soft HEAD~6 will remove the commits, then you can git add and git commit normally?

quozl commented 8 years ago

@samdroid-apps, this pull request says "unknown repository", how can I pull from this?

samdroid-apps commented 8 years ago

Hum it appears that the author has deleted their original branch. Github says:

Merging via command line

If you do not want to use the merge button or an automatic merge cannot be performed, you can perform a manual merge on the command line.

Patch

Step 1: From your project repository, check out a new branch and test the changes.

git checkout -b ndefilippis-master master
curl https://github.com/sugarlabs/sugar-toolkit-gtk3/pull/284.patch | git am

Step 2: Merge the changes and update on GitHub.

git checkout master
git merge --no-ff ndefilippis-master
git push origin master
quozl commented 8 years ago

Ah, right, thanks, didn't know it meant original branch delete, I worried that it was some sort of web based pull request without a local repository. Yes, a wget of .patch is a great idea.

ndefilippis commented 8 years ago

Can I create a new pull request so I don't have to deal with rebasing, and I can just make it one commit?

samdroid-apps commented 8 years ago

Yes, you could create a new pull request from a fresh branch

quozl commented 8 years ago

You don't need to create a new pull request to deal with rebasing. The way you deal with rebasing is to do the rebase on your local repository, and then force push to the same branch as before.

But if you have deleted the branch, you must create a new branch and a new pull request.

I'm not certain you deleted your branch.

ndefilippis commented 8 years ago

I did in fact delete my branch. That was probably a mistake