8 Sep
2010
8 Sep
'10
10:07 a.m.
I'm slowly getting my head around git.
I am trying it out on a large project, which is on a server (in my office) to which I have only SSH access, or access to the files via Samba. I ran a merge (which took quite while) and now need handle the conflicts.
Looking for a decent tool to assist with the merge, I find that most are GUI based, and that suits me fine (and will help me get others in the office to buy-in to using it). However, if I access the files over the samba share and run "git status" it takes a while (10 mins?), presumably because my local git is having to deal with a lot of traffic over the network.
Is there a better way to use a local merge tool on a remote repo?
--
Mark Rogers // More Solutions Ltd (Peterborough Office) // 0844 251 1450
Registered in England (0456 0902) @ 13 Clarke Rd, Milton Keynes, MK1 1LG