git-packages.md: create page. #1
Conversation
git-packages.md
Outdated
| The following example uses | ||
| [git-clone(1)](https://man.voidlinux.org/git-clone.1). | ||
|
|
||
| ``` | ||
| do_fetch() { | ||
| git clone <project_url> ${wkrsrc} --depth 1 | ||
| cd ${wrksrc} | ||
| git checkout <feature_branch> | ||
| } | ||
| ``` |
There was a problem hiding this comment.
I had to add a text paragraph that wasn't an item in the list because otherwise vmdfmt folds the code block into the list using inline code. Might be a bug.
git-packages.md
Outdated
| The following example uses | ||
| [git-clone(1)](https://man.voidlinux.org/git-clone.1). | ||
|
|
||
| ``` | ||
| do_fetch() { | ||
| git clone <project_url> ${wkrsrc} --depth 1 | ||
| cd ${wrksrc} | ||
| git checkout <feature_branch> | ||
| } | ||
| ``` |
| totally different content to merge later | ||
| >>>>>>> new_branch_to_merge_later | ||
| ``` | ||
|
|
There was a problem hiding this comment.
i think it might be useful to explain what the annotations mean, and how one resolves conflicts?
There was a problem hiding this comment.
Fair enough, I will try to search for a good article to link to, perhaps. Not sure I'd do a great job of it.
|
Is this intended as a packaging guide for void into the repositories? We almost never accept |
Not at all, it is for personal use only. I can make that explicit. The part about including patches could lead to changes that would be accepted into the repos, tho. |
|
Yes, it would probably be good to not only make it explicit, but to use language along the lines of void-packages CONTRIBUTING, which says:
which says "anymore" because there are (i believe) still some existing templates that do use a specific revision. Hopefully that might forestall "But what about <font_x> being in the repos?"-type issues. :-) |
I maintain mtpaint (the package/template) which uses a git revision in the template in order to pull from gh, because the author does not tag releases but does commits with a release number as a message : wjaguar/mtPaint@ff0a801 That is probably outside the scope of the policy statement but... these exceptions exist. |
|
Ok, that is a fair point. I guess |
|
Updated! |
ericonr
changed the title
Some inspiration for the conflict part taken from: https://opensource.com/article/20/4/git-merge-conflict
|
Thanks for the suggestions, updated! |
No description provided.