DGNum/metis
17
2
Fork 1
Code Issues 12 Pull requests 3 Projects Releases Packages Wiki Activity

chore(calendars.json): Remove unused calendars #68

Open
thubrecht wants to merge 1 commit from thubrecht/cleanup into master
pull from: thubrecht/cleanup
merge into: DGNum:master
Conversation 1 Commits 1 Files changed 1 +3 -39
thubrecht commented 2024-01-26 11:08:04 +01:00
Owner
Copy link
No description provided.
thubrecht added 1 commit 2024-01-26 11:08:04 +01:00
thubrecht commented 2024-01-26 11:08:15 +01:00
Author
Owner
Copy link

@mdebray

@mdebray
This pull request has changes conflicting with the target branch.
  • data/calendars.json
View command line instructions

Checkout

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

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 thubrecht/cleanup
git checkout thubrecht/cleanup
git rebase master
git checkout master
git merge --ff-only thubrecht/cleanup
git checkout thubrecht/cleanup
git rebase master
git checkout master
git merge --no-ff thubrecht/cleanup
git checkout master
git merge --squash thubrecht/cleanup
git checkout master
git merge --ff-only thubrecht/cleanup
git checkout master
git merge thubrecht/cleanup
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
  
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
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: DGNum/metis#68
No description provided.
Delete branch "thubrecht/cleanup"

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?