search

LnL7 / nix-darwin

nix modules for darwin
MIT License
3.19k stars 456 forks source link

Add inline prediction option mirroring the capitalization option #966

Closed 347Online closed 3 months ago

emilazy commented 5 months ago

Thank you for the contribution! Looks like the tests are failing, unfortunately.

347Online commented 5 months ago

This is true. I haven't figured out why yet. I've been meaning to take another look but then I got busy šŸ™ƒ

347Online commented 5 months ago

Ah, alright, no problem. I'll do that when I get back to my computer.

347Online commented 5 months ago

I think that should be done, I really appreciate the assist!

Please let me know if I need to make any additional changes, thank you! :)

EDIT: Crap... I think I made it worse šŸ˜‘

emilazy commented 5 months ago

Looks like you accidentally moved the new upstream commits after yours ā€“ if you run git rebase -i 29d16ceb7c13c2741d10f77230caca6163cfa904^ you should be able to just remove all the lines other than your commit and resolve the conflict. Gitā€™s UI is pretty terrible, sadlyā€¦

347Online commented 4 months ago

Sorry for the delayed response - I tried your latest suggestion to no avail, I assume I must not be understanding something? šŸ¤”

I'll keep tinkering

emilazy commented 4 months ago

Gitā€™s UI is really awful, itā€™s not your fault. (Iā€™ll take this opportunity to plug Jujutsu, which makes all of this a lot simpler and easier to recover from; I canā€™t imagine using Gitā€™s UI directly any more.)

In general when working on Nix ecosystem repositories you almost always want to git pull --rebase and not introduce any merge commits, and liberally use git commit --amend and git rebase --interactive to squash fixes into the original commits. The easiest way to get out of this mess is probably as follows:

# Get the latest revision from LnL7/nix-darwin into FETCH_HEAD
# Replace ā€œupstreamā€ with whatever your https://github.com/LnL7/nix-darwin.git remote is
# (`git remote list` to find out, `git remote add` if you donā€™t have one)
$ git fetch upstream master

# Put your current branch at FETCH_HEAD without changing your working tree
$ git reset FETCH_HEAD

# Record every change between upstream and your current files as a single commit
$ git commit -a

# Check the commit turned out right; if something looks wrong, adjust your files
# and `git commit --amend -a` until it looks good
$ git show HEAD

# Update your pull request
$ git push --force-with-lease
347Online commented 4 months ago

Jujutsu sounds VERY cool, I'll have to give it a look

I'm traveling for work this week, but I'll definitely give your suggestions a try when I can.

I really am sorry about all this, I can't tell you how much I appreciate all your help, thank you so much <3

347Online commented 3 months ago

I think I may finally have cleaned it up