mathijs/corona
1
0
Fork 0
Code Issues 1 Pull requests 1 Releases Wiki Activity

fix issue where province_state is set to netherlands #2

Open
mathijs wants to merge 1 commit from fix_province_index into master
pull from: fix_province_index
merge into: mathijs:master
Conversation 0 Commits 1 Files changed 1 +171 -454
mathijs commented 2020-04-01 10:46:12 +00:00
Owner
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • 20200317_corona.ipynb
View command line instructions

Checkout

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

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 master
git merge --no-ff fix_province_index
git switch fix_province_index
git rebase master
git switch master
git merge --ff-only fix_province_index
git switch fix_province_index
git rebase master
git switch master
git merge --no-ff fix_province_index
git switch master
git merge --squash fix_province_index
git switch master
git merge --ff-only fix_province_index
git switch master
git merge fix_province_index
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: mathijs/corona#2
No description provided.
Delete branch "fix_province_index"

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?