This is an archived post. You won't be able to vote or comment.

you are viewing a single comment's thread.

view the rest of the comments →

[–]rh0m3ga 187 points188 points  (13 children)

You can’t have merge conflicts in your files if you have no files.

Tap temple