4 ms·
So I append X to my file and you append Y to your file, do we not have a conflict?
by aidenn0 7y ago
So I append X to my file and you append Y to your file, do we not have a conflict?
- capableweb 7y agoYes 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 7y agoIf you want to resolve merges using the workflow of git, you can generate scratch files and diff them, right?