@DrFacepalm thanks for opening your first PR :)

Thanks for helping me out, rather new to this whole contributing and nix scene so if I'm missing the mark on a few things please let me know :)

to fix up the history, you can do:

git reset HEAD~11
git add maintainers
git commit -m "maintainers: add drfacepalm"
git add pkgs
git commit -m "pythonPackages.frameioclient: init at 0.7.5"
git push ... ... --force

Alright I'll give that a go. My git skills are rather lacking haha

looks likes some other files got mixed up in there, try this:

git reset HEAD~2 # put the last two commits into unstaged
git add maintainers/
git commit -m "maintainers: add drfacepalm"
git add pkgs/top-level/python-packages.nix
git add pkgs/development/python-modules/frameioclient/
git commit -m "pythonPackages.frameioclient: init at 0.7.5"
git push ... ... --force

# optional if you want to clean up the accidental changes
git checkout .

Okay scratch what i just did i think i undid some of the changes in the other files

I have a question, what happens to the other files that are modified?

I have a question, what happens to the other files that are modified?

What I think happened, is that original git reset HEAD~11 was based off the commits that were done on your fork. However, your local git repo had less than 11 commits. So you also got come changes that weren't really yours mixed in.

git rebase -i would probably have been better, but harder to communicate how to use it over text

Yeah i was playing around with it and i saw the commits looked like:

commit by me
commit by me
commit by me
commit by someone else 
commit by someone else
commit by me
commit by me

and i wasn't too sure how that had happened.... but either way, trying to rebase that went over my head.
Either way, is there anything else that needs doing on this pull request?

I believe that should be good. thanks for the help!

I marked this as stale due to inactivity. → More info

Reopen and rebase if you would like to have this merged.