Labview merging with git extensions

[beckwith]

thankyou! very much!!

I have a general question!! i have implemented git extensions, tortoisesvn, tortoisehg! I was able to use them with SCM manager. We are trying to stick to one version control!!

How would u rate tortoisegit against tortoisesvn? Any thoughts are welcome!!!

[beckwith]

HI what  versions of tortoisegit, mysysgit ur using.

Also please let me know if we have to install windows installer 4.5 on windows 7?

[gauravch852]

Hi,

I am trying to do diff & merge operation via TortoiseGit. So far i have managed to do diff successfully but not sure how to do merge. It would be really helpful if you can give me some clue about it.