Skip to content
Better HN
Top
Best
Ask
Show
New
Jobs
Search
⌘K
0 points
aidenn0
6y ago
0 comments
Save
Share
So I append X to my file and you append Y to your file, do we not have a conflict?
0 comments
2 comments · 1 top-level
top
newest
oldest
capableweb
6y ago
· 1 in thread
Yes and no. Yes as in, if you'd like them to be merged into a new one, then you'll have to resolve a conflict. But no as in, you both appended different data, so you both have new files from the original one, as you're dealing with immutable data.
strbean
6y ago
If you want to resolve merges using the workflow of git, you can generate scratch files and diff them, right?
j
/
k
navigate · click thread line to collapse