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.

If you want to resolve merges using the workflow of git, you can generate scratch files and diff them, right?