Write documentation for sugar3.graphics.style

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 documentation for sugar3.graphics.style #285

Closed ndefilippis closed 8 years ago

ndefilippis commented 8 years ago

I just reforked and repulled becaues I couldn't figure out rebase

quozl commented 8 years ago

Sorry, but your commit contains git conflict markers, please try again and check your commit carefully before sending pull request.

quozl commented 8 years ago

Perhaps you might ask for help on rebasing in the previous pull request? I'm happy to help there or on IRC.

ndefilippis commented 8 years ago

What are conflict markers?

quozl commented 8 years ago

Conflict markers are inserted by git during a merge, and you are expected to resolve them, edit them out, and complete the commit. When you've left them in a commit it means you didn't finish resolving before commit.

quozl commented 8 years ago

Also, you might like to know that you can do a rebase and then force push onto your original pull request. It takes a few careful steps, but it keeps the history of comments in one place. Some of us like that. :grin: