nwesterhausen/dfraw_parser
1
0
Fork 0
Code Issues 4 Pull requests 3 Projects Releases 35 Packages Wiki Activity Actions

dep updates etc #99

Open
nwesterhausen wants to merge 6 commits from some-changes into main
pull from: some-changes
merge into: nwesterhausen:main
Conversation 0 Commits 6 Files changed 15 +27488 -831
nwesterhausen commented 2024-05-29 16:02:20 +00:00 (Migrated from github.com)
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • .vscode/settings.json
  • Cargo.lock
  • lib/Cargo.toml
  • lib/bindings/DFRawJson-Tauri.d.ts
  • lib/bindings/DFRawJson.d.ts
  • lib/src/parsed_definitions/creature.rs
  • lib/src/parsed_definitions/inorganic.rs
  • lib/src/parsed_definitions/plant.rs
  • update_bindings.ps1
View command line instructions

Checkout

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

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 some-changes
git switch some-changes
git rebase main
git switch main
git merge --ff-only some-changes
git switch some-changes
git rebase main
git switch main
git merge --no-ff some-changes
git switch main
git merge --squash some-changes
git switch main
git merge --ff-only some-changes
git switch main
git merge some-changes
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

  
question

Further information is requested

  
wontfix

This will not be worked on

No labels
bug
dependencies
documentation
duplicate
enhancement
github_actions
good first issue
help wanted
invalid
question
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: nwesterhausen/dfraw_parser#99
No description provided.
Delete branch "some-changes"

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?