[docs] Update custom-commands.md adding DDEV_UID & DDEV_GID

[rpkoller]

Adding DDEV_UID and DDEV_GID in the list of variables available on the host

The Issue

How This PR Solves The Issue

Manual Testing Instructions

Automated Testing Overview

Related Issue Link(s)

Release/Deployment Notes

[rfay]

Thanks!

[gilbertsoft]

Thanks! Please rebase your branch, looks like you did not use latest master.

[rfay]

Thanks!

[rpkoller]

@gilbertsoft uhhhh i haven't done quick one-off pull requests with just small changes in a text file directly via the github interface very often. so far i was under the impression that forks are kept up to date automatically in contrast to the command line where you run git pull first. but that was a false assumption damn :( still much to learn. thats the reason my main branch was behind i've based the PR on.
but in regards of the rebase. am i am able to do that in the github ui as well or is that only possible via the command line? cuz i've looked for how to rebase a PR on github and all the postings (for example https://github.blog/changelog/2022-02-03-more-ways-to-keep-your-pull-request-branch-up-to-date/ ) mention an update branch-button at the bottom of the page. but i only have a resolve conflict-button instead there.

Update: or wait a second. would it be ok instead of looking for a rebase button simply update the branch in my fork? so far i only updated the main branch. but i went ahead into the branch for this PR and clicked update branch there and then click the compare & pull request another time that popped up?

[rfay]

@rpkoller If you used the web UI to create this patch, it used the latest master version, and created a new branch for you based on upstream/master. The problem is that you in the meantime had another PR pulled, which changed the underlying docs file. So now you have to rebase and solve the conflicts. You can also do that in the web UI, but I find that kind of hard.

There are many merge conflict resolution techniques, you'll want to look at them. If you use vscode I imagine it has one.

This is a very easy one to learn rebasing on, resolving conflicts, so may be worth your time. A lazy person could just do the PR over again. A less lazy person could just check out the branc, git reset --hard upstream/master and overwrite the contents with the intended changes (again).

There are many ways to study the conflicts, one easy one is to click this button,

But it will be a good exercise for you to learn how to rebase and solve conflicts, and this is a really easy one to do it on.

[rpkoller]

Oh ok. when i checked the variant i suggested to go back to my ddev fork and into the corresponding branch there i would have the option to update the branch but that would drop/delete one commit (supposedly the one i did). but i would go with your suggested approach @rfay and go via the resolve conflicts button. but i suppose the cleanest approach for that is to copy the two line i'Ve added in this PR and copy them from the PR block down into the mast block and then delete the PR block and the dividers <<<<<, ==== and >>>>>. i think that would be the cleanest approach correct?

update: ahhh the resolve button does the rebase/update as well since after resolving the conflict i see that the master branch got merged into the branch. that wasn't clear by seeing only the resolve conflict page. i "think" i've understood now. hope i've done everything correctly now. (thanks @rfay for the recommendation)

[gilbertsoft]

Oh ok. when i checked the variant i suggested to go back to my ddev fork and into the corresponding branch there i would have the option to update the branch but that would drop/delete one commit (supposedly the one i did). but i would go with your suggested approach @rfay and go via the resolve conflicts button. but i suppose the cleanest approach for that is to copy the two line i'Ve added in this PR and copy them from the PR block down into the mast block and then delete the PR block and the dividers <<<<<, ==== and >>>>>. i think that would be the cleanest approach correct?

update: ahhh the resolve button does the rebase/update as well since after resolving the conflict i see that the master branch got merged into the branch. that wasn't clear by seeing only the resolve conflict page. i "think" i've understood now. hope i've done everything correctly now. (thanks @rfay for the recommendation)

Thanks! We are able to merge now, conflicts resolved :)

[rfay]

Another chance to practice your conflict resolution, thanks. This is a result of your two PRs touching the same area. It probably would have been easier for you to fix both things in one PR. We generally all avoid that but this would have been a good place to relax about it.

[rpkoller]

yep true, i agree. but hope the conflicts are fixed now.

[rfay]

The docs test failure is an upstream problem, not from this PR. See

• [docs] Fix moved link in spf13/cobra #5004

[rfay]

Oh, but after the earlier discussion, do you want those periods at the end of each of these?

[rfay]

Updated to pick up the upstream test fix, make sure you pull before working on it.

[rpkoller]

At first i thought it was a good idea and i wanted to do that within the consistency issue. but i've dropped that idea in #4998 (comment) and agreed to @gilbertsoft . @mattstein also agreed to his point #4998 (comment). so this issue would be ready now that the tests are green after you upstream fixes.

[rfay]

Try this. You can just commit both of these by clicking the buttons.