Aparently some people did really like it, see tweets bellow :-) I also got feedback that “not yet real programmers”, that is students, didn’t really get what I was talking about. Well, most of them still uses SVN (well, if they do it’s a success anyways) as an SCP replacement so there’s not much they could complain in SVN about if they’re not making it work anyhow besides just storing files. :-) Some students apparoached me after the lecture and training (yeah, we also did a little git intro with laptops later on) and they were really fired up about it – even if not yet grasping git’s power, they felt something’s on and I am very happy to have invluenced even just a small group to such feelings and thinking.

I have been invited (via the Call for Papers I participated in) to present a polished up “Git. Tak. Po prostu.” speech at this years IT Festival. It was a really great opportunity to show lot’s of people (primarily students, and to-be-students but also some currently working people) the joy and beauty of Git. The event was really nice (it’s constantly improving, since the last few editions I think) and I’ve had some fun with my pal from work etc. I’ve also got to know some of the speakers – really nice guys :-) Anyways, find bellow the video from the presentation recorded by my newly met pal kzubik and the polished up slides (they’re a lot better than the previous ones).

Video:

The video is uploaded to Vimeo

Slides:

http://www.slideshare.net/ktoso/git-tak-po-prostu-sfi-version

Well, that was all nice and cool but git (other DVCS have this too) has a lot more to offer! :-) Today we’ll look into git bisect and how to automate it’s execution using maven to look for a commit that breakes something. You may run ANY SCRIPT and even write your own and git will use it to test if a commit is “bad” or “good”. Ok, but let’s slowdown a little… What git bisect basically does is performing an binary search, between a range of commits you specify looking for “the first bad commit” you you can easily find what caused the bug and fix it. You can drive it by hand and after starting git bisect just test the commit by hand and tell git if it’s good or bad by “git bisect bad” “git bisect good”. Git is smart enough to find what commit he should “git checkout …” next to perform a binary search based on your anwsers.

Today we’ll learn how to make git cooperate with maven and find the first commit that introduced a test failure. See bellow for the full workflow you showcasing this:

Ok up until now we’ve just created a simple repository we’ll be running the tests on. Let’s tag this state as “yeah it’s working here” just so that I don’t have to remeber the SHA-1 of this commit.

And now we’ll run a script that does some random commit action, just so that bisect has a lot of commits to work on.

The tests are still passing… time to change that! We’ll break the build with the following commit. And then generate yet another 50 commits to “hide it”… ;-)

Ok the test’s fail now. But suppose you didn’t know which commit introduced the bug (in our case made the test’s fail). You’d have to guess which one, or check them all or just work it out by looking at your current repository state. But since you’re doing small commits and do them often – it’ll be great if you found out which commit caused this failure. As it’s preferably small, it’ll be very easy to find out what change caused the build to fail. No is the time to use git bisect!

We’ve started bisect, and told him which commit we’re sure is working and which we’re sure is failing. Git will now checkout a commit he found “somewhat in the middle” and will continue to bisect (binary search) the commit history based on wether a commit is “good” or “bad”. We could just tell it git by hand by doing “git bisect good/bad” etc. But let’s git bisect run a script to do this for us :

Yeah, we’ve found our failing commit :-) You could use any script you want here, it just has to return 0 if git should think it’s a “good commit” and “not 0″ if it’s a “bad commit”. I’ve even seen runners written in PHP running or spellcheckers – you name it… :-) Ok but how does this magical script that we’ve just run look like?

Whoa, that’s simple… :-) Keep on git hacking guys! See you soon, with some more git or java tips… :-) Oh and I’ll post my presentation (holefully with video) from SFI soon, so keep an eye out! :-)

PS: Yup, the code retreat we’re (SCKRK with a little help from the PolishJUG) organizing got “sold out” after just 3h… ;-) Be sure to take a look and be quicker next time! http://coderetreat.sckrk.com

The code comes from http://arnorehn.de/cgi-bin/weblog_basic/index.php?p=34 so big kudos too him :-)

Cheers and happy hacking!

PS: I’m waiting for my T-shirt and stickers (for training participants) to arrive from github. I’d love they make it in time for SFI but I’m not sure if it’s even possible hmmm…

As I’d rather show the participants around git and not just “how the hell do I use vimdiff?!” I’m posting this little snippet on howto use KDiff3 on windows. Of course we’re probably going to have quite simple conflicts that could easily be conflicted without tooling but it’s nice to have one prepared when you need one. So, this is what you need to run KDiff3 on windows as a mergetool (paste this inside of your .git/config file)

[merge]
    tool = kdiff3

[mergetool "kdiff3"]
    path = C:/Program Files/KDiff3/kdiff3.exe
    keepBackup = false
    trustExitCode = false

And you’ll need to download kdiff3 for windows of course, this can be done on their sourceforga page. And that’s basically it. I’ll reconfirm that this really works tomorrow as I’m getting somewhat tired already… Well then…

Gundam fighters set, ready….. goooo!
* stupid quote from  G Gundam ;-)

UPDATE
The plugin is now available from Sonatype Nexus!

    
        sonatype-releases
        Sonatype Releases
        https://oss.sonatype.org/content/repositories/releases/
    

END OF UPDATE

Now I’ll be a bit lazy and just paste the README I’ve prepared for maven-git-commit-id-plugin on github.

  git clone git://github.com/ktoso/maven-git-commit-id-plugin.git maven-git-commit-id-plugin
  cd maven-git-commit-id-plugin
  mvn install

   <?xml version="1.0" encoding="UTF-8"?>
   <project xmlns="http://maven.apache.org/POM/4.0.0"
            xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
       <modelVersion>4.0.0</modelVersion>

       <groupId>pl.project13.maven</groupId>
       <artifactId>my-git-plugin-sample-app</artifactId>
       <packaging>war</packaging>
       <version>0.1</version>
       <name>my-git-plugin-sample-app</name>
       <url>http://www.blog.project13.pl</url>

       <parent/>

       <dependencies />

       <build>
           <!-- GIT COMMIT ID PLUGIN CONFIGURATION -->
           <resources>
               <resource>
                   <directory>src/main/resources</directory>
                   <filtering>true</filtering>
                   <includes>
                       <include>**/*.properties</include>
                       <include>**/*.xml</include>
                   </includes>
               </resource>
           </resources>

           <plugins>
               <plugin>
                   <groupId>pl.project13.maven</groupId>
                   <artifactId>git-commit-id-plugin</artifactId>
                   <version>1.0-SNAPSHOT</version>
                   <executions>
                       <execution>
                           <goals>
                               <goal>revision</goal>
                           </goals>
                       </execution>
                   </executions>
                   <configuration>
                       <prefix>git</prefix> <!-- that's the default value -->
                       <dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat> <!-- that's the default value -->
                       <verbose>true</verbose> <!-- false is default for this -->
                       <dotGitDirectory>${project.basedir}/../.git</dotGitDirectory> <!-- required, you have to specify this path -->
                   </configuration>
               </plugin>
               <!-- END OF GIT COMMIT ID PLUGIN CONFIGURATION -->

               <!-- other plugins -->
           </plugins>
       </build>
   </project>

 git.branch=${git.branch}

 git.build.user.name=${git.build.user.name}
 git.build.user.email=${git.build.user.email}
 git.build.time=${git.build.time}

 git.commit.id=${git.commit.id}
 git.commit.user.name=${git.commit.user.name}
 git.commit.user.email=${git.commit.user.email}
 git.commit.message.full=${git.commit.message.full}
 git.commit.message.short=${git.commit.message.short}
 git.commit.time=${git.commit.time}

<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">

    <bean name="gitRepositoryInformation">
        <property name="branch" value="${git.branch}"/>
        <property name="commitId" value="${git.commit.id}"/>
        <property name="commitTime" value="${git.commit.time}"/>
        <property name="buildUserName" value="${git.build.user.name}"/>
        <property name="buildUserEmail" value="${git.build.user.email}"/>
        <property name="commitMessageFull" value="${git.commit.message.full}"/>
        <property name="commitMessageShort" value="${git.commit.message.short}"/>
        <property name="commitUserName" value="${git.commit.user.name}"/>
        <property name="commitUserEmail" value="${git.commit.user.email}"/>
    </bean>

</beans>

package pl.project13.maven.example.git;

import org.codehaus.jackson.annotate.JsonWriteNullProperties;

/**
 * A spring controlled bean that will be injected
 * with properties about the repository state at build time.
 * This information is supplied by my plugin - <b>pl.project13.maven.git-commit-id-plugin</b>
 *
 * @author Konrad Malawski
 */
@JsonWriteNullProperties(true)
public class GitRepositoryState {
  String branch;                  // =${git.branch}
  String commitId;                // =${git.commit.id}
  String buildUserName;           // =${git.build.user.name}
  String buildUserEmail;          // =${git.build.user.email}
  String buildTime;               // =${git.build.time}
  String commitUserName;          // =${git.commit.user.name}
  String commitUserEmail;         // =${git.commit.user.email}
  String commitMessageFull;       // =${git.commit.message.full}
  String commitMessageShort;      // =${git.commit.message.short}
  String commitTime;              // =${git.commit.time}

  public GitRepositoryState() {
  }

  /* Generate setters and getters here */
}

<context:property-placeholder location="classpath:*.properties" />
<import resource="classpath:/git-bean.xml"/>

 @Controller
 @RequestMapping("/git")
 public class GitService extends BaseWebService {

     @Autowired
     GitRepositoryState gitRepoState;

     @RequestMapping("/status")
     public ModelAndView checkGitRevision() throws WebServiceAuthenticationException {
       ServerResponse<GitRepositoryState> response = new ServerResponse<GitRepositoryState>(gitRepoState);
       return createMAV(response);
     }
 }

 {
     "branch" : "testing-maven-git-plugin",
     "commitTime" : "06.01.1970 @ 16:16:26 CET",
     "commitId" : "787e39f61f99110e74deed68ab9093088d64b969",
     "commitUserName" : "Konrad Malawski",
     "commitUserEmail" : "konrad.malawski@java.pl",
     "commitMessageFull" : "releasing my fun plugin :-)
                            + fixed some typos
                            + cleaned up directory structure
                            + added license etc",
     "commitMessageShort" : "releasing my fun plugin :-)",
     "buildTime" : "06.01.1970 @ 16:17:53 CET",
     "buildUserName" : "Konrad Malawski",
     "buildUserEmail" : "konrad.malawski@java.pl"
 }

[ktoso@protos somerepo-v2]$ git remote \
                            add origin \
                            git@github.com:ktoso/somerepo.git
[ktoso@protos somerepo-v2]$ git pull
remote: Counting objects: 13, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 9 (delta 2), reused 9 (delta 2)
Unpacking objects: 100% (9/9), done.
From github.com:ktoso/somerepo
0b59dd3..87b0c22  master     -> origin/master
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').

See git-pull(1) for details.

If you often merge with the same branch, you may want to
use something like the following in your configuration file:

[branch "master"]
remote = <nickname>
merge = <remote-ref>

[remote "<nickname>"]
url = <url>
fetch = <refspec>

See git-config(1) for details.

Well, git has actually already told us what we might want to do. But can’t this be done easier? Of course~!

[ktoso@protos somerepo-v2]$ git branch --set-upstream \
                                         master \
                                         origin/master
Branch master set up to track remote branch master from origin.
[ktoso@protos somerepo-v2]$ git pull
Updating 0b59dd3..87b0c22
Fast-forward
.......

And now we can easily pull and push changes again, without the hassle of specifying the obvious each time we’d want to get/share some changes. :-)

So… Since I’ve started using git-svn at work, I do have an possibility to make things better now! The answer lies in client-side-hooks and git aliases (“custom commands”). First let’s write this as an simple bash script, that we’ll locate in the .git/hooks/ folder:
It’s a fairly simple script, so I wont bore you explaining it in detail – if in doubt, feel free to ask. We only need to place this script as “.git/hooks/pre-commit” and make it executable and git will take care of the rest for us. Oh and in case you’re wondering where that org.eclipse.jdt.core.prefs came from. It’s created by eclipse into the .settings folder when you check some option to “use formatter per project” – that’s the only time I had to fire up and click around in eclipse to get it’s formatter running “headless”. Ok, let’s check if it works…

Yup, you can agree or not with the formatting rules – but what matters is that the whole team decided on it and that we keep it consistent throughout the whole project. This hook will definitely help with this. :-) Step two for me was changing this into a git command, so that I wouldn’t launch eclipse each time I just do some quick local commiting. The solution is to drop the hook idea (although it’s quite nice) and create an custom git command. We do this by doing an alias like that:

git config --global alias.eclipse-formatter '!~/git-hook-eclipse-formatter'

The !command alias support is with us in git since 1.5.0 and it enables us to launch any program/script as an git command. Great, just what I wanted! Let’s now see what this command really did:

As you can see, adding an alias is as simple as adding it to your ~/.gitconfig or, if you want to setup the alias “per project”, to .git/config – pretty cool, ay? Also, this command will be included in bash-autocompletition suggestions! :-)

That’s it for today… happy hacking!

Łukasz Lenart – “Nie samym kodem programista żyje”

Łukasz’s presentation was not a technical one this time. He talked about how to be/become an effective programmer. A nice tip he noted was to carry a notebook and note your ideas in it – i sometimes try to but did find myself forgetting some “amazing idea” due to the lack of discipline in carring such notebook (yeah, an paper-notebook… :-)) so it’s definitely something worth reminding. He also talked a little about Kaizen, ZenToDone and the Pomodoro Technique which all kinda share the same idea but explain it a little bit differently. I also was quite happy to find out that I’m not the only one that gets slown down in development when actually being in the company – with lots of stuff happening around me. Admit it – we all work more productive when there’s noone bugging us ;-)

The most notable tips where the “alone-zone” (as explained in REWORK (good book, I recommend it)) which is really great and I love it, but sometimes it’s hard to enforce – coding is usualy team work, ain’t it..? Using multiple desktops – and monitors at best, to seperate your work space from fun space. Cutting oneself off from the internet is, while extreme, very effective by the way. I noticed it quite a few times – there’s simply nothing distracting you – same goes for anything that might take your attention. By the way, I’m not really convinced about Pomodoro – what if you get into an v. nice flow and then the pomodoro snaps you out of it? I guess it may be more targeted at people working at bigger companies – not as myself in an small nice team and nowadays, mostly from home.

All in all he warmed up the audience perfectly and let’s hope some of theese tips help us become better programmers… :-)

• //TODO: watch on parleys.com
• //TODO: download slides
• download video

Konrad Malawski – “Git (tak. po prostu.)”

The PJUG guys asked me to tell a little about git and I happily agreed to do it – thus, my first “public presentation”. Firstly I’d like to explain why the slides where so “weird”. It’s because I wanted them to be something like an “break”, and most of the session was live terminal typing. They were all hand drawn by me and my girlfriend, then scanned and recoloured in GIMP. Took a few evenings to prepare them, but I hope they where quite memorable, fun, and did point out the important aspects of what the next topic would be about – an 3 headed dragon as symbol for lots of HEADs in an git repo etc… ;-)

Click to show presentation

I’ve been preparing the flow of all examples before but during the presentation I missed out a few steps and made a some stupid mistakes (see my previous git post on this blog ;-). Well, it wasn’t anything world breaking I guess and I’d really like to thank the audience for such great support. We strayed a little of the path I’ve prepared sometimes, but that’s ok as it was interesting to interact with the audience during an presentation – not just stand there and “praise git to zee heavnz” ;-) Such interaction is something I (personally) really like in presentations, even if they break a little due to this :-)

All in all, we managed to go through all of git’s basic features and in the end even mentioned rebase – which can be used to change the history of ones commits (there’s also the very useful git commit –amend), detached-HEADs and git-svn, which I didn’t use before as I feared a little to make a mess in the company svn-repo (and in all “my” projects I’m using git, so I never felt the need to use git-svn). Some guys sucessfully used it and really recommended it, thus… here I am, doing git svn dcommits on an daily basis… :-) I’m glad to have also learned something from this presentation, not just “showed what I had to show” :-) Now just a few links to very good resources about git:

• A Successful Git Branching Model
• Very good video tutorial on git
• https://git.wiki.kernel.org/index.php/GitFaq
• http://git-plumbing-preso.heroku.com – internals
• https://github.com/ – free opensource project hosting
• and of course: http://git-scm.com/documentation

After the presentation I made an small sms-contest where you could win an PJUG tshirt for guessing what github’s mascot is called like. I hope it was an nice positive accent to finish the session. Next up was the pizza and then 2 more Łukasz’s… :-)

• //TODO: watch on parleys.com
• download slides
• download video

Łukasz Żmudziński – “Project Lombok – Cause We Hate Boilerplate!”

Lombok, if you didn’t see it before is this -> http://projectlombok.org/ It’s a “total hack”, as the author describes it (and he’s right ;-)) but it allows some funny compile time hacks while writing Plain Old Java Code. Łukasz showed us around all the annotations which Lombok provides and how they work, what code exactly would be generated by them etc. The most “let’s you write less code” annotation would be @Data, which at compile time would cause Lombok (…here comes the important part:) to write the source for all setters, getters and toString hashcodes etc – so javac in the end, thinks it’s just compiling plain odl java… Here’s a link on how it works: Data.html The funny part about it is that it’s an compile time tool – much similar to Spring Roo in that aspect if you ask me -  and what it actually modifies is the AST (AbstractSourceTree) that javac then uses to generate it’s bytecode… So no bytecode magic – just how I’d call it… source code injection during compile time? Yeah, weird stuff.

And if you ask me not really something I’d be using all over the place. Sure it’d spare me the writing of some getters and setters and some more tricks but in the end, it’s a problem for not supported IDEs. (How do you explain IDEA that this class really *will have* an setBla() method…?) While NetBeans and Eclipse do have plugins to enable them to unserstand lomboks annotations. It’s not really enough – what about static code analisis tools? They’d go nuts with code that calls methods which dont exist in the source etc :-) Nevertheless if was a fun topic and it definitely is an quite funny javac hack, but if I’d be desperate for such features… I’d go polyglot coding with groovy or scala etc… :-)

• //TODO: watch on parleys.com
• download slides
• download video

Łukasz Czerpak – “Testy jednostkowe i integracyjne w przykładach”

By now you probably noticed it… There where almost only Łukasz’s presenting on this Camp…! :-) Łukasz Czerpak’s topic was about, generally speaking, TDD. He focused (as the title suggests, if you can read polish ;-)) on unit and integration tests. The border between them is sometimes a little blury, but the definitions he have were nice and clear – 1 class = unit, long setup involved = integration. It’s as easy as that, yet sometimes during discussions with other coders these sometimes get confised. Next he went on to some examples of how TDD is useful and finally to a lot of code examples. As he’s using EJBs at his day job, this part was mostly covered – and very interesting (for me, who’d usually just use spring and be done with it).

The mocking framework he used in his examples was of course our Polish Mockito… :-) It’s really great and lot’s of fun to work with, unlike some other mocking frameworks out there. Although easymock would take the 2nd place if I’d were to make an ranking. I’ve also seen a little JMock but it doesn’t “feel good” – but if youre interested in pure “what X can do”, they all do offer the same things, so why bother with some cluttery syntax? :-)

Next, Łukasz showcased using glassfish as an embeded container which definitely is on my “good to know” list and then continued on to an very awesome JBoss library: Arquillian [arquillian homepage] (see? It’s so cool I even had to mark it bold ;-)) It’s an lib which enables you to deploy (yes, “deploy” – perfect word choice) EJBs or even whole archives to an testing enviroment – which would then be started using an embeded container, although as seen on their homepage, they also support remote containers… interesting! Here’s another nice usecase of it: http://ocpsoft.com/seam/cdi-powered-unit-testing-using-arquillian/ The presentation was really well prepared and most probably the high

• //TODO: watch on parleys.com
• //TODO: download slides
• download video

That’s all folks!

We’ll be doing another JavaCamp in the near future (January perhaps…?). But for theese few weeks now we’ll be focusing on the upcomming GeeCON 2011 (Cracow) and kickstarting it’s call for papers (yay, I’m it’s author ;p). And if you’re interested in seeing all recordings on parleys.com and not just as videos – stay on your toes, because after Devoxx we’ll upload them there – I’ll update my blog then and we’ll write an quick news about it on java.pl In the mean time, you can go take a look at these and the previous (javacamp #4) recordings on camp.java.pl – which I just quickly set up to allow you guys quick access to the movies…

Yup, that’s all I think… see you on GeeCON || JavaCamp #6! :-)

git mv oldname newname
        =
mv oldname newname
git add newname
git rm oldname

Note that last line, git rm oldname is what we fotgot to do in our example, thus git was seeing an just the “new file” version of our operation. One line wrong, yet very important :-) Let’s check if it works this way:

[ktoso@homunculus test]$ ls
jeden  typescript
[ktoso@homunculus test]$ git init .
Reinitialized existing Git repository in /home/ktoso/test/.git/
[ktoso@homunculus test]$ cat jeden
drugi pliczek
[ktoso@homunculus test]$ echo 'dwadwa' > dwa
[ktoso@homunculus test]$ cat dwa
dwadwa
[ktoso@homunculus test]$ git add .
[ktoso@homunculus test]$ git commit -m 'dodanie ich'
[master (root-commit) a430782] dodanie ich
2 files changed, 2 insertions(+), 0 deletions(-)
create mode 100644 dwa
create mode 100644 jeden
create mode 100644 typescript
[ktoso@homunculus test]$ git mv
dwa         .git/       jeden       typescript
[ktoso@homunculus test]$ git mv jeden nowy-jeden
[ktoso@homunculus test]$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       renamed:    jeden -> nowy-jeden
#
[ktoso@homunculus test]$ mv
dwa         .git/       nowy-jeden  typescript
[ktoso@homunculus test]$ mv dwa nowe-dwa
[ktoso@homunculus test]$ git add nowe-dwa
[ktoso@homunculus test]$ git rm dwa
rm 'dwa'
[ktoso@homunculus test]$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       renamed:    dwa -> nowe-dwa
#       renamed:    jeden -> nowy-jeden
#
[ktoso@homunculus test]$ echo "problem Solved... :-)"
problem Solved… :-)

Yup, it actually detects the renames proppery. Even more, it would detect an “copy” action (this works even easier):

[ktoso@homunculus test]$ cp nowy-jeden nowy-jeden-jeden
[ktoso@homunculus test]$ git add .
[ktoso@homunculus test]$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       renamed:    dwa -> nowe-dwa
#       copied:     jeden -> nowy-jeden
#       renamed:    jeden -> nowy-jeden-jeden
#       modified:   typescript
#

I’m already converting all the presentations to MP4 files and they’ll be online soon I hope :-) Then I’ll also write an usual “review” as I always do with any confernce/meering. For now just a quick summary: An amazing attandee count, nice presentations and an very very nice crowd :-) Thanks a lot for all the talks, but let’s wair for my “review” with more informations about JC5… :-) (Oh, yes we’re allready planing JC6… ;-))

Having that said… there is one thing I don’t like there… it’s SVN ;-) Of course I knew that I can’t be running from SVN all my life and that I’d end up using it someday in some company… As some may know, I’m a big Git (or mercurial) fan, thus – I kinda see what SVN is doring wrong. At XSolve we have this weekly-event called “Fridays at XSolve”, where one can present in a short 30min session, something he’s been interested in lately etc. It’s a really cool idea, that allows ideas do spread throughout the company – the HR team seems to really care to keep this atmosthere in the company… :-) This Friday I was given the honour and joy to be presenting Git – as we’ve been talking about it a few times during my first week here. Below is the presentation I’ve used:

You can download the presentation or the sources for the presentation here as they are also a simple (I’ve made one about Guava that’s a little more interesting from the TeX viewpoint) example of the LaTeX beamer – which apparently is also an favourite tool of some team members… :-) I’ve also talked a moment after the event with an v. good (so it seems) developer who knew really a lot about many different SCMs – we mentioned “cherry picking” which is really interesting but I don’t know much about it yet. If you don’t know much about Git – take a look at the above presentation, or better, start out your new (better) life with git by visiting these links:

• http://www.youtube.com/watch?v=4XpnKHJAok8 Linusa Torvalds on Git vs CVS/SVN
• http://whygitisbetterthanx.com – why git is better than any other SCM ;-) A biased site obviously ;-)
• http://git.or.cz/course/svn.html – side-by-side with SVN
• http://git-scm.com – Git homepage

The presentation worked quite well I guess – some team members who knew about Git/SVN/Mecurial/Bzr etc, where adding their bits of knowledge which really made the presentation a lot more than just a bunch of boring slides… ;-) All in all it was all of those: fun, interesting and yet another occasion for me to train presenting stuff (I’m still bad at it, but well… life is study, right? :-)) I’m really happy to have the opportunity to be working in such a environment – I’ll post whatever is inseresting on this blog (if I have the time to do so :<), so keep an eye ot for some Java/GWT posts… :-)