57
edits
Talk:Discourse Modeling: Difference between revisions
Talk:Discourse Modeling (view source)
Revision as of 17:01, 13 November 2022
, 17:01, 13 November 2022→Conflict Resolution
mNo edit summary |
|||
| Line 48: | Line 48: | ||
==== Conflict Resolution ==== | ==== Conflict Resolution ==== | ||
* {{d|id=page-forking |a=? |type=question |text=problem with wiki is that there is only one version of each page - what if you disagree? |supports=}} | * {{d|id=page-forking |a=? |type=question |text=problem with wiki is that there is only one version of each page - what if you disagree? |supports=}} | ||
** {{d|id=fed-wiki |a=? |type=question |text=in wiki each page has a single version | ** {{d|id=fed-wiki |a=? |type=question |text=in wiki each page has a single version ==> federated wiki is the solution |supports=page-forking}} | ||
** {{d|id=fed-wiki-git |a=? |type=claim |text=pages in a federated wiki are more like working in branches as in git |clarifies=fed-wiki}} | ** {{d|id=fed-wiki-git |a=? |type=claim |text=pages in a federated wiki are more like working in branches as in git |clarifies=fed-wiki}} | ||
*** {{d|id=fed-wiki-merging |a=? |type=claim |text=''branches'' and ''merges'' are important ideas in the federated wiki concept space |supports=fed-wiki-git}} | *** {{d|id=fed-wiki-merging |a=? |type=claim |text=''branches'' and ''merges'' are important ideas in the federated wiki concept space |supports=fed-wiki-git}} | ||