working on merging configs, adding branch/switch/pull commands

client/.gvc/.gvcconfig.toml

@@ -2,8 +2,8 @@ version = "0.1.5"
 rootpath = ""
 reponame = "gvc"
 currentbranch = "master"
-localbranches = ["master"]
-remotebranches = ["master", "test", "test2"]
+localbranches = ["master", "localbranch1", "localbranch2"]
+remotebranches = ["master", "serveronlybranch", "anotherserverbranch"]
 
 [[remote]]
   name = "test2"
@@ -36,12 +36,16 @@ remotebranches = ["master", "test", "test2"]
   default = false
 
 [locked]
-  files = ["test1\\client8.exe", "client1.exe", "client.go"]
-  exts = [".png"]
+  files = ["client1.exe", "client2.exe", "client.go", "serverLocked.go"]
+  exts = [".exeServer", "serverCOMP2EXT"]
 
 [ignore]
-  files = ["client1.exe", "client2.exe", "client3.exe", "client4.exe", "client5.exe", "client6.exe", "client7.exe", "test1\\client8.exe", "clientcmd\\init.go"]
+  files = ["client1.exe", "client2.exe", "client3.exe", "client4.exe", "client5.exe", "client6.exe", "client7.exe", "test1\\client8.exe", "clientcmd\\init.go", "localignoreonly.go"]
   exts = [".exe", ".tl"]
+  folders = ["serverFolderIgnore", "serverFolderignore2"]
 
 [nocompress]
+  files = ["localnocompress.go"]
+  exts = ["serverNoCompressEXT", "serverCOMP2EXT"]
+  folders = []
 

client/.gvc/.gvcconfig.toml.old

@@ -1,25 +1,50 @@
-rootPath = "client"
 version = "0.1.5"
+rootpath = ""
+reponame = "gvc"
+currentbranch = "master"
+localbranches = ["master", "localbranch1", "localbranch2"]
+remotebranches = ["master"]
+
+[[remote]]
+  name = "test2"
+  host = "localhost"
+  port = 80
+  default = true
+
+[[remote]]
+  name = "test4"
+  host = "localhost"
+  port = 9998
+  default = false
+
+[[remote]]
+  name = "test3"
+  host = "localhost"
+  port = 9997
+  default = false
+
+[[remote]]
+  name = "test5"
+  host = "localhost1"
+  port = 9997
+  default = false
+
+[[remote]]
+  name = "test6"
+  host = "localhost1"
+  port = 9995
+  default = false
+
+[locked]
+  files = ["client1.exe", "client2.exe", "client.go", "locallocked.go"]
 
 [ignore]
-    files = [ "file1.txt", "file2.txt" ]
-    exts = [ ".jpg", ".png" ]
-    folders = []
-
+  files = ["client1.exe", "client2.exe", "client3.exe", "client4.exe", "client5.exe", "client6.exe", "client7.exe", "test1\\client8.exe", "clientcmd\\init.go", "localignoreonly.go"]
+  exts = [".exe", ".tl"]
+  folders = []
 
 [nocompress]
-    files = [ "fileA.log", "fileB.txt" ]
-    exts = [ ".exe", ".jpg" ]
-    folders = ["binaries"]
-
-[[remote]]
-name = "origin"
-host = "testorigin.com"
-port = 8694
-
-[[remote]]
-name = "secondOrigin"
-host = "170.5.95.195"
-port = 4253
-
+  files = ["localnocompress.go"]
+  exts = []
+  folders = []