search

haganbmj / MagicSetEditor2

Magic Set Editor is a program for designing trading cards
Other
21 stars 8 forks source link

djackddonovan pull requests on the master? #55

Open Darthagnon opened 1 year ago

Darthagnon commented 1 year ago

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 commented 1 year ago

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

Darthagnon commented 5 months ago

chrome_240615_104

haganbmj commented 5 months ago

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 https://github.com/haganbmj/MagicSetEditor2/pull/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 commented 5 months ago

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

https://github.com/haganbmj/MagicSetEditor2/pull/53