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.

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

djackddonovan pull requests on the master? #55

Open
Darthagnon opened this issue Dec 27, 2022 · 5 comments
Open

djackddonovan pull requests on the master? #55

Darthagnon opened this issue Dec 27, 2022 · 5 comments

Comments

@Darthagnon
Copy link

I noticed @djackddonovan opened a few pull requests on the MSE master (his fork: https://github.com/djackddonovan/MagicSetEditor2). Was wondering if they could be integrated here, since this seems to be where development is happening?

@haganbmj
Copy link
Owner

Yeah, I haven't been the most active, but if there's people interested in making changes that'd be great.

@Darthagnon
Copy link
Author

chrome_240615_104

@haganbmj
Copy link
Owner

haganbmj commented Jun 17, 2024

Huh, I would've guessed it's because you're not a collaborator on their fork, but it looks like I was able to create one #77 so maybe permissions when you don't have access to either fork are just really messy.

I expect the PR I opened is going to be a struggle too since I don't have permission to commit back changes to correct the merge conflicts. I might have to copy that branch into a repo I do have permissions on to make that feasible.

@haganbmj
Copy link
Owner

To make it more confusing maybe I think I had cherrypicked some of those changes way back when.
Here's at least one example.

#53

@Darthagnon
Copy link
Author

#77

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants