andydude

// filename: cmd/foo/foo.go

package main

import simple "simple"

func main() {
	d := simple.GetData()
	simple.PutData(d)
}

andydude

// filename: cmd/foo/foo.go

package main

import simple "simple"

func main() {
	d := simple.GetData()
	simple.PutData(d)
}

andydude

// file: nested/foo/foo.go

package main
import "nested/sub"

func main() {
	nestedsub.Foo()
}

andydude

$ git fetch
...

$ git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.andrew-working.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.