Resolving SVN Conflicts

Our method for merging branches back to trunk:
branch> svn merge from trunk [rev_last_merged_from_trunk]:[HEAD]
branch> (resolve conflicts, deploy, test)
branch> commit
(at this point, the branch should be exactly what trunk has plus all changes done in the branch)
trunk> svn merge from branch [rev_first_branched_from_trunk]:[HEAD]
For some reason svn still sees a ton of conflicts when doing that last step. In the past I would have to manually go through each file and just copy what was in the branch on top of trunk and then “mark resolved”. However, now there is a faster way: Using at least SVN v1.5 at command line:
svn resolve -R --accept theirs-full
Thats it! Its a life saver. Or at least a time saver.
(This can be dangerous. Make sure you have resolved all true conflicts in the branch before doing the “resolve all”)

Wuala: Reliable, secure, distributed storage.

When you store a file, it is first encrypted on your computer and then chunked up and encoded into redundant fragments using erasure codes (Reed-Solomon codes). These encrypted, redundant fragments are then stored in our European data centers and in the Wuala cloud. We make sure that your data is always safe. A complete backup of your encrypted files is always kept on our servers, so that it can always be accessed and restored. The Wuala cloud serves as an optimization that allows us to operate a large-scale infrastructure at low cost and to provide you with better performance. Also, it allows organizations to get access to reliable online storage by providing their own resources to the Wuala cloud.

Wuala protects your privacy: In stark contrast to most other online storage services, all your files get encrypted on your computer, so that no one - including the employees at Wuala and LaCie - can access your private files. Your password never leaves your computer.

Wuala employs the 128 bit AES, 2048 bit RSA and SHA-256 algorithms for encryption, signatures and integrity checks. If you're interested in how Wuala manages encryption, have a look at our publication on Cryptree. More >>

Apple's applied for patent to prevent 'sexting' using iOS

Recently, Apple applied for patent to prevent 'sexting' via apple products e.g., iPod, iPad, iPhone. The patent explain who iOS manage to detect 'sex' related messages and prevent them from propagation among people in social network facilitated by apple products.

Mikogo: Free Web Conferenceing and Desktop Sharing

Mikogo web-conferencing, easy-to-use cross-platform desktop sharing tool,ideal for online meetings or remote support. Currently, it could share screen contents or application over Internet upto ten simultaneously remote people.

Mikogo is best (in term of saving energy, time, and costs) for collaborative environments where people (researcher, engineers, developers, financial advisors, insurance brokers, businessmen, etc) share and discuss their work.

All transmitted information during a web conference or remote support session is compressed with proprietary compression algorithms. Mikogo never sends session content in clear text, but encrypts all data using 256-bit AES encryption. The Mikogo website is secured with 128-bit encryption using Secure Sockets Layer (SSL), which is the most widely used Internet standard for securing sensitive web data communications.