kfir/haifa-reminder
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity

ics_file_method #2

Open
kfir wants to merge 0 commits from ics_file_method into master
pull from: ics_file_method
merge into: kfir:master
Conversation 0 Commits - Files changed -
kfir commented 2023-03-28 14:51:28 +00:00
Owner
Copy link

made a branch with a different method like what we spoke:

the output is an .ics file with all the events found.

made a branch with a different method like what we spoke: the output is an .ics file with all the events found.
kfir added 5 commits 2023-03-28 14:51:28 +00:00
kfir added 1 commit 2023-03-29 07:47:42 +00:00
This branch is already included in the target branch. There is nothing to merge.
View command line instructions

Checkout

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

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 ics_file_method
git checkout ics_file_method
git rebase master
git checkout master
git merge --ff-only ics_file_method
git checkout ics_file_method
git rebase master
git checkout master
git merge --no-ff ics_file_method
git checkout master
git merge --squash ics_file_method
git checkout master
git merge --ff-only ics_file_method
git checkout master
git merge ics_file_method
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: kfir/haifa-reminder#2
No description provided.
Delete branch "ics_file_method"

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?