search

asusoda / Corundum

This is a new plugin-based server-side modding A.P.I. for Minecraft. [WIP]
MIT License
7 stars 1 forks source link

Biome.java.orig? #9

Closed Niadevv closed 10 years ago

Niadevv commented 10 years ago

Recently looking through the latest commits, I noticed this file. Some of the files's contents (like <<<<< HEAD) reminds me of what I got a couple times trying to git pull with a local modified README.md. Furthermore, it appears to be outdated compared to the Biome class, which I assume is what this .orig file is for. Should it be deleted? I'm asking as it could be important or the actual most up to date, with a few things missing/removed.

Of course, this appears to be a Github thing, and it's not major. I just think it'd be a bit weird for people later on looking in that directory, seeing the .orig and go "lolwut? What's a .orig".

Variadicism-zz commented 10 years ago

Oh, whoops. Sorry. Those files are generated by my Git Mergetool, kdiff3, when I use it to resolve merge conflicts. The ".orig" is short for "original"; kdiff3 stores them as backups when merging files. I usually get rid of them before committing, but I guess I forgot that time. There's no reason to keep them; they can be deleted. I think there's a way to make kdiff3 get rid of them when you're done merging; I just haven't found it yet.