search

JohnRThomas / Exia-Mining-All-In-One

A mining script for Runemate
7 stars 7 forks source link

Pulling updates #12

Closed Kneckter closed 8 years ago

Kneckter commented 8 years ago

I have a local copy of the code if anything goes wrong with the pull.

Kneckter commented 8 years ago

Only the barbarian village code (f15635c) needs to be added to your code. The others can be rejected.

JohnRThomas commented 8 years ago

I had to rebase my repository since commit fbe278b git a weird author somehow (I honestly have no idea how that happened).

Can you make a fresh repository and remake the changes to that file? Otherwise that commit goes back into the history.

Sorry about that.

JohnRThomas commented 8 years ago

Never mind about making a new pull request. I figured out how to cherry pick so that you are still the author of the commit.

I would suggest making a clean repo, or at lead reverting your head to the head of my repo so that the extra commit history is rightfully ignored.

Thanks

Kneckter commented 8 years ago

I couldn't figure out how to clean it up. So I deleted it reforked haha.

JohnRThomas commented 8 years ago

Sounds good. Sorry about that.