(I wanted to change them so they are transmitted inline in the migrate process instead of r'synced - because of that may fail badly...)
meld is probably a good tool to use.
usually you start by git pull master and resolve the conflicts.
I wonder what these conflicts may be? I didn't do anything about the configs yet...
I'm starting to see some conflicts that might be tough to keep in sync, so it might be time to merge the "configdb" branch with "master"
Of course, I'm no good at this. Can I get some help?
