orpheus/hackmos2023
Watch
1
0
Fork
You've already forked hackmos2023
 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Huiqi dev #2

Open
grey220022 wants to merge 5 commits from huiqi-dev into main
pull from: huiqi-dev
merge into: orpheus:main
Conversation 0 Commits 5 Files changed 101 +34150 -1
grey220022 commented 2023-10-07 05:06:37 -04:00 (Migrated from github.com)
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • .gitignore
  • Cargo.toml
  • README.md
  • chainconfig/config/app.toml
  • examples/test-local.rs
  • monitor/monitor.js
  • monitor/package.json
  • tests/integration.rs
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 huiqi-dev:huiqi-dev
git switch huiqi-dev

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 huiqi-dev
git switch huiqi-dev
git rebase main
git switch main
git merge --ff-only huiqi-dev
git switch huiqi-dev
git rebase main
git switch main
git merge --no-ff huiqi-dev
git switch main
git merge --squash huiqi-dev
git switch main
git merge --ff-only huiqi-dev
git switch main
git merge huiqi-dev
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug
Something isn't working

  
dependencies
Pull requests that update a dependency file

  
documentation
Improvements or additions to documentation

  
duplicate
This issue or pull request already exists

  
enhancement
New feature or request

  
github_actions
Pull requests that update GitHub Actions code

  
good first issue
Good for newcomers

  
help wanted
Extra attention is needed

  
invalid
This doesn't seem right

  
javascript
Pull requests that update Javascript code

  
question
Further information is requested

  
rust
Pull requests that update Rust code

  
wontfix
This will not be worked on

No labels
bug
dependencies
documentation
duplicate
enhancement
github_actions
good first issue
help wanted
invalid
javascript
question
rust
wontfix
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
orpheus/hackmos2023!2
No description provided.