* dolt_checkout and read replication working set fixes
Sql path 'dolt_checkout' used to create a new branch from HEAD
if the checkout name did not have a remote tracking ref. The CLI,
on the other hand, will initialize a local branch if a remote tracking
ref with the same name in the default remote exists. The SQl path
now mirrors the CLI checkout: if we checkout a new branch, like
'new_feature', and we have previously fetched that branch from our
default remote, `dolt_checkout('feature')` will initialize a branch
using the head commit from the remote `feature`.
Second, read replication was creating a local tracking branch for
remote branches (sourced from the master remote), but not creating
corresponding working sets. This let users attach to new branches with
`use db/feature` syntax, but prevented users from
`dolt_checkout('feature')` both for the bug in dolt checkout, but also
because we created an intermediary state with a local branch, but
without a corresponding working set. SQL replication will now fetch,
create the new branch, and create the appropriate working set.
* jennifer's feedback
* unskip
* Fix merge test for __DOLT_1__
* tree.ThreeWayMerge always calls callback when key collision occurs
* add keyless support for new format merge and other merge related tables
* newline of doom
* unskip more bats
* empty
* skip blame.bats and remotes-aws.bats
* sql_pull compiles
* Fix sql-merge bats
* Fix merge bats tests, add pull
* Cleanup comments
* Some of zach's comments
* Fresh set of sql-pull unittests
* bats name typo
* Windows doesn't support file:/// with 3 slashes
* Add one more comment line
* fix one of the check errors
* Add short circuits to cli progress goroutines
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
