Re: Avoiding the three-windows merging with Git

[Kévin Le Gouguec]

Marcin Borkowski <address@hidden> writes:

> Why should it connect to any remote site?

To be fair, cloning/fetching/pushing from/to local repos is not a
feature I've seen advertised often, though obviously it's All There In
The Manual :)

> In fact, it would be probably even simpler to use branches instead of
> clones for creating artificial conflicts like this.

Sure, that is a rather heavy-handed way to create conflicts.

What I like about this setup is that it allows someone unfamiliar with
Git "remotes" to experiment locally, either to learn the basics of the
push-pull-whoops-conflict workflow, or to tinker with more advanced
stuff (server hooks, being on the wrong end of git push --force…)