But every cloud has a silver lining, which in this case means that I get to mention a wonderful tool called Kompare. A picture is worth more than a thousand diffs:
![](https://blogger.googleusercontent.com/img/b/R29vZ2xl/AVvXsEgF0JIvasmFXv0E3t9oU3sjYXe-B35cCxT_AhtQ8Deekc_vqf8pMHuU094bWBQCH1dJO_QFyGvvWUU7xkjfISCzkwLaFiZVzMQzZX2PUFrHkimx_Q8ILT1eZHORAaQezyPD1YpDktcq-ww/s320/kompare.png)
I can tell you right now that this baby takes away a lot of hassle from manually merging conflicts. Give it a spin if you can.
So, I'm a bit wiser now. After I'm done with the merge I'll finally upload the new liblash code to a feature branch which I created last night. That should speed things up a little again.
1 kommentti:
If you like Kompare, you should certainly try out Meld, it's like Kompare on steroids.
Lähetä kommentti