Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge "hm/Cleanup" into "orgin/master" #27

Open
BinToss opened this issue Jun 25, 2020 · 1 comment
Open

Merge "hm/Cleanup" into "orgin/master" #27

BinToss opened this issue Jun 25, 2020 · 1 comment
Assignees
@BinToss

Comments

@BinToss
Copy link
Collaborator

BinToss commented Jun 25, 2020

Due to this branch's widespread changes, this should be the last of the HaloMods repository's branches to be merged into master.
It will require a TON of manual merging.
@BinToss BinToss self-assigned this Jun 26, 2020
@BinToss
Copy link
Collaborator Author

BinToss commented Jul 15, 2020

I'm currently cherry-picking Cleanup's commits to a copy of master and then I'll create a Pull Request.
Seven commits down and I've been chipping away 5bfb3692 for a few hours now.

1,140 conflicts left to manually resolve before I can continue cherry-picking commits.
Stopping for the night.

After this CP is done, there's 37 more commits to deal with.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@BinToss BinToss

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@BinToss