search

Aleteh / TBR3

The Black Road - Dota 2 RPG
http://d2tbr.com/
1 stars 0 forks source link

Added aura for item + private fork #7

Open jibrankhan opened 8 years ago

jibrankhan commented 8 years ago

Little formatting fix, new aura for item, pulling from private fork and a few debug messages.

Arhowk commented 8 years ago

Did you really need to fork the entire repo just to make that one commit?

MNoya commented 8 years ago

Well you don't fork part of a repo :smile:

I think direct commits & symblinks are better tho, but whatever works for you guys

jibrankhan commented 8 years ago

My work flow is work off a fork then make pull requests, but I can do direct commits as well. I'd prefer for now doing the former, and have someone take a quick look for any problems. Then later I'll do direct.

That merge commit is certainly horrible to look at though :(

jibrankhan commented 8 years ago

Maybe working off a branch would be better.

Arhowk commented 8 years ago

Just stay on a branch on Aleteh's repo.

Aleteh commented 8 years ago

There are some conflicts, but i guess it has something to do with the reorganizing of items i did.