This was made for the dev branch, but Source Tree messed things up

NicoM1 / IceEntity

A simple framework for managing entitys, components, and live-at-runtime scripts in haxeflixel

MIT License

58 stars 7 forks source link

This was made for the dev branch, but Source Tree messed things up #18

Closed sruloart closed 9 years ago

NicoM1 commented 9 years ago

you should be able to change where your merging to, just merge from your master to my dev, they should be equal anyway this was made for the dev branch but source tree messed things up by sruloart _2014-09-06_14-57-27

NicoM1 commented 9 years ago

actually looked it up and you need to make a new pull, just make sure the target is NicoM1:dev

sruloart commented 9 years ago

The problem is my master is behind the the dev... Hold on...