XTLS/Xray-install
1
0
Fork 0
Code Issues 29 Pull requests 3 Projects Releases Packages Wiki Activity Actions

install openwrt, fix issue #25 #83

Open
xiagw wants to merge 2 commits from xiagw/install-openwrt into main
pull from: xiagw/install-openwrt
merge into: XTLS:main
Conversation 1 Commits 2 Files changed 1 +288 -156
xiagw commented 2024-12-07 09:00:12 -05:00 (Migrated from github.com)
Copy link
  • Refactor install-release.sh to improve error handling and streamline checks
  • Add OpenWrt support to install-release.sh
- **Refactor install-release.sh to improve error handling and streamline checks** - **Add OpenWrt support to install-release.sh**
yuhan6665 commented 2024-12-29 23:49:06 -05:00 (Migrated from github.com)
Copy link

Can you please help to resolve conflict?

Can you please help to resolve conflict?
This pull request has changes conflicting with the target branch.
  • install-release.sh
View command line instructions

Checkout

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

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 main
git merge --no-ff xiagw/install-openwrt
git switch xiagw/install-openwrt
git rebase main
git switch main
git merge --ff-only xiagw/install-openwrt
git switch xiagw/install-openwrt
git rebase main
git switch main
git merge --no-ff xiagw/install-openwrt
git switch main
git merge --squash xiagw/install-openwrt
git switch main
git merge --ff-only xiagw/install-openwrt
git switch main
git merge xiagw/install-openwrt
git push origin main
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
XTLS/Xray-install!83
No description provided.