Byon September 27, 2007 8:22 AM
Well, I got the e-mail today, that apparently my first Patch has been accepted into the Rhythmbox Project, making me a GNOME Contributor (finally). I’m glad to finally be doing some coding in something other than web programming for projects that I use regularly anyway. Unfortunately, the maintainer that applied my patch had a tweak a few things, but it was just an error message that wasn’t very clear and an small organizational issue, so I’m pretty happy with that.
Still, it was pretty exciting to get that e-mail.
Unfortunately, the changes made by the Maintainer who did the commit have made it more difficult for me to merge my development branch for this patch into the master branch on my local git repo. Fortunately, this means that it’s an ideal opportunity to learn how to handle conflict resolution in git.