protonphoton/LJ
7
0
Fork 1
Code Issues Pull requests 1 Releases Wiki Activity

[fix] The install should be more streamlined #2

Open
alban wants to merge 4 commits from feature-install into master
pull from: feature-install
merge into: protonphoton:master
Conversation 0 Commits 4 Files changed 1 +38 -47
alban commented 2020-10-14 15:17:44 +00:00
Owner
Copy link

Based on the lj-packer process.

Asks questions for optional packages and before running the whole install.

Based on the lj-packer process. Asks questions for optional packages and before running the whole install.
This pull request has changes conflicting with the target branch.
  • server/install.sh
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature-install:feature-install
git checkout feature-install

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 checkout master
git merge --no-ff feature-install
git checkout feature-install
git rebase master
git checkout master
git merge --ff-only feature-install
git checkout feature-install
git rebase master
git checkout master
git merge --no-ff feature-install
git checkout master
git merge --squash feature-install
git checkout master
git merge --ff-only feature-install
git checkout master
git merge feature-install
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: protonphoton/LJ#2
No description provided.
Delete branch "feature-install"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?