Updated Frequently-Asked-Questions (markdown)

dn42 wiki commited 2014-06-09 03:25:22 +0200 commit f544ca46bd4c104e8e63ecb37b3a142be8f6eed9

Frequently-Asked-Questions.md

@@ -1,3 +1,5 @@

+[[_TOC_]]

+

 ## Why are you using monotone for the registry? Why not GIT?

 There is an important difference between the data model of monotone and GIT: In GIT branches *are* HEADs, while in monotone, branches are a list of HEADs. Or, to state it simpler and probably less correct: It is possible to sync merge conflicts in monotone. In GIT, conflicts are part of the index and/or working tree, and thus can't be pushed/pulled.

...	...	@@ -1,3 +1,5 @@
	1	+[[_TOC_]]
	2	+
1	3	## Why are you using monotone for the registry? Why not GIT?
2	4
3	5	There is an important difference between the data model of monotone and GIT: In GIT branches are HEADs, while in monotone, branches are a list of HEADs. Or, to state it simpler and probably less correct: It is possible to sync merge conflicts in monotone. In GIT, conflicts are part of the index and/or working tree, and thus can't be pushed/pulled.