search

Standouthost / Multicraft

Open Source Multicraft Scripts
GNU General Public License v3.0
44 stars 53 forks source link

Update stuff #1

Closed Frankrd3 closed 10 years ago

Frankrd3 commented 10 years ago

Not entirely sure about what i'm doing but I hope it works.

Jmainguy commented 10 years ago

Yup there are a few merge conflicts in this (Git is hard at first, really awesome once you get the hang of it, I like to think I am in the middle of lost and getting it ). You would likely be best deleting your fork, starting a new fork, then creating a branch. Then in that branch, you make the changes (java args) and push those to your branch, then in your branch click merge / pull request thing. Then it should be a clean change for me to pull.

Otherwise, its going to try and make me pull all the differences between when you pulled a few months ago, and what we both have now. I am on IRC server freenode, name is Jmainguy if you are ever on IRC.

Frankrd3 commented 10 years ago

Okay i'll give that a try. Thanks.

Jmainguy commented 10 years ago

Closing this as a new one is going to be submitted.