https://github.com/jtemporal/example-conflict

used in the conflict resolution tutorial
https://github.com/jtemporal/example-conflict

Last synced: 3 months ago
JSON representation

used in the conflict resolution tutorial

• Host: GitHub
• URL: https://github.com/jtemporal/example-conflict
• Owner: jtemporal
• Created: 2022-02-02T00:30:58.000Z (over 4 years ago)
• Default Branch: main
• Last Pushed: 2022-02-02T01:02:47.000Z (over 4 years ago)
• Last Synced: 2025-03-02T06:14:35.713Z (over 1 year ago)
• Size: 1000 Bytes
• Stars: 1
• Watchers: 3
• Forks: 0
• Open Issues: 1
• Metadata Files:
  • Readme: README.md

Awesome Lists containing this project

README

          
# Directory created as an example about conflict resolution

Suppose this is the file that is being worked on and two people are making alterations to it.

Both people will make the update on the next line.

Person 1 was here.