Get config from env #880

Open
jackyzy823 wants to merge 1 commit from jackyzy823/env into master
jackyzy823 commented 2023-05-15 04:08:01 -04:00 (Migrated from github.com)

For #633

Load Order: Env -> (if not exists, or if exists but empty) -> INI -> (if not exists, or if exists but empty) -> Default.

For #633 Load Order: Env -> (if not exists, or if exists but empty) -> INI -> (if not exists, or if exists but empty) -> Default.
This pull request has changes conflicting with the target branch.
  • README.md
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin jackyzy823/env:jackyzy823/env
git switch jackyzy823/env

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff jackyzy823/env
git switch jackyzy823/env
git rebase master
git switch master
git merge --ff-only jackyzy823/env
git switch jackyzy823/env
git rebase master
git switch master
git merge --no-ff jackyzy823/env
git switch master
git merge --squash jackyzy823/env
git switch master
git merge --ff-only jackyzy823/env
git switch master
git merge jackyzy823/env
git push origin master
Sign in to join this conversation.
No description provided.