Trackback URI
 
 
 
 
 
 
 
 
 

More git for newbies: merge vs. rebase

One of the things everybody points out about git is that it's a fairly complex system. Of course, other version control systems like Subversion are complex as well, but git doesn't seem to do as much as the others insulate you (the user) from what's going on "under the hood." Case in point: the difference between merging and rebasing....

 
 
 
 
 
 
 
 
 

Acclimating to Git

I've been watching git with interest for a while now, because the concept of a distributed version control system — one where you don't need to contact a central server to make a record of your recent changes — would go pretty well with a lot of the things I use version control for. (Not just source code, but managing homework and papers that I type...

 
 
 
 
 
 
 
 
 

SIP/PyKDE

I just tried to test a plasmoid written in Python and got the initially confusing error message

the sip module implements API v7.0 but the PyKDE4.plasma module requires API v6.0

It wouldn't be noteworthy except that my usual technique of Google-searching to find...

Featured projects:

 TextWriter
A web application for rendering text in a selected font into an image.
The current version is 0.5a, as of January 17, 2009.
 Spectrata
A frequency domain sound editor, with the ability to trasform between images and spectra.
The current version is 0.1a, as of May 15, 2007. The next version is 0.1b; no expected release date has been set. Requires Java version 1.6 or better.
 KPasswordGenerator
A small KDE panel applet that can generate random passwords as desired.
The current version is 0.1, as of September 17, 2006. The next version is 0.2a; no expected release date has been set. Requires KDE version 3.5 or better.

For listings of all Ellipsix projects, check the programs page.