Code

History

Commits on git-sync to docs/technical/conflicts.md11
  1. docs: fix some documentation errors and improvementsBjörn Kautler committed 10 months ago24905c8
  2. files, tree: make same-change conflict resolution configurableYuya Nishihara committed 1 year agoaf4fe21
  3. conflicts: document the "same-change rule"Philip Metzger committed 1 year ago6cbb21f
  4. docs conflicts.md: clarify the revert example a bitIlya Grigoriev committed 1 year ago5a73518
  5. docs conflicts.md: fix confusing typoIlya Grigoriev committed 1 year ago1f14f7a
  6. docs: make technical conflicts doc better match our recent thinkingMartin von Zweigbergk committed 1 year ago92629de
  7. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  8. bookmarks: update some leftover uses of the word "branch"Martin von Zweigbergk committed 2 years ago1aa2aec
  9. docs: update description of conflicts to be about tree-level conflictsMartin von Zweigbergk committed 3 years agoec7f9e7
  10. cleanup: consistently (?) put removed conflict terms before added onesMartin von Zweigbergk committed 3 years agod087e64
  11. docs: add technical doc about a conflict designMartin von Zweigbergk committed 4 years agob64ee14