New package: comfy-0.5.4

[dacousb]

General

• This is a new package and it conforms to the quality requirements

Have the results of the proposed changes been tested?

• I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

[astralchan]

Squash the three commits to one - one commit per package. I recommend using git commit --amend for further commits after that.

[astralchan]

Simplify distfiles

[astralchan]

The four commits still need to be squashed to one to adhere to the one commit per package rule. git rebase -i HEAD~4, choose squash for the last three, and git push origin master -f. Personal recommendation, I might make a branch relating to the package git checkout -b comfy and PR from that branch, that's just me though.

[dacousb]

The four commits still need to be squashed to one to adhere to the one commit per package rule. git rebase -i HEAD~4, choose squash for the last three, and git push origin master -f. Personal recommendation, I might make a branch relating to the package git checkout -b comfy and PR from that branch, that's just me though.

@kawaiiamber I've tried and I don't really know why, it does not work. It may be because I've done some changes with GitHub Web. Sorry!

[astralchan]

No problem! It's an easy fix ^-^. I would highly recommend using the git command line utility as that is what I can help with. If you're using void yourself, xbps-install -S git if you haven't done so already. The first thing you want to do is clone your fork on void-packages. For https:

git clone https://github.com/dacousb/void-packages.git
cd void-packages

Add the void-linux void-packages repo as an upstream remote:

git remote add upstream https://github.com/void-linux/void-packages.git

I would copy the template you made for comfy somewhere, then checkout on a new branch:

git checkout -b comfy
git pull --rebase upstream master # not really needed if you JUST cloned it :)

Put the directory / template in for comfy, then add that directory to the tracking index: git add srcpkgs/comfy
Then put it to your fork:

git commit -m "New package: comfy-0.5.4"
git push origin comfy

Then, just click "edit" on the top right of this PR and change from your master branch to the "comfy" branch on your fork. For editing this PR after, just use --amend:

# make your changes
git add srcpkgs/comfy
git commit --amend # write and quit with same commit message
git push origin comfy -f # -f to force push as your ammending a commit

OR

If you want to merge on this branch (master branch on your fork), here's a quick guide to squashing commits with rebase:

git rebase -i HEAD~5 # since there's five commits

This will take you into an interactive rebase (that's what the -i is for :3). There will be five lines at the top that say "pick " and comments below telling you what the commands do. We want the first one to be "pick". To edit the last four, it's like vim. i to go into insert mode, then just replace the last four pick with squash instead. Then Esc + :wq + retrun. Then force push this to your master branch to squash the commits: git push origin master -f. Again, at this point, use --amend for future changes to the PR:

# make your changes
git add srcpkgs/comfy
git commit --amend # write with same commit msg
git push origin master -f

I hope this was helpful - let me know if you have questions, either here or email me (on my github profile) ^-^

[dacousb]

@kawaiiamber thanks for your support! anyway, every time I clone and rebase the repository, I get errors like:

[astralchan]

@kawaiiamber thanks for your support! anyway, every time I clone and rebase the repository, I get errors like:

What's the full error / exact command?

[dacousb]

@kawaiiamber oh I'm so sorry, I totally forgot about this... Here it is the error:

Thanks in advance!

[astralchan]

git stash
git reset
git add srcpkgs/comfy

[dacousb]

@kawaiiamber still does not work, I'm struggling so hard with this, other repos just work with the rebase... I don't know what to do.