[Ktechlab-devel] Merging the master and minimal_simulator

[Zoltan Padrah]

   Hello,

  after some experimentation with git, I've found an easy way to merge the  
2 branches.

1. move everything from the minimal_branch simulator to a new directory
2. commit the move: git commit -A
3. check out master: git checkout master
4. merge minimal_branch to the master: git merge minimal_simulator

I don't want to push the changes before we decide about the directory  
structure: where should the source go and what should be the directory's  
name?

After we merge these, probably the next step in synchronization would be  
to bring Julian's and my master branch in sync. Then the buildsystem needs  
to be integrated (should be simple).

  Regards,

   Zoltan