1
0
Fork
You've already forked MyFin
1

WIP: Separate database code from component code #4

Draft
phloose wants to merge 9 commits from phloose/MyFin:abstractions into abstractions
pull from: phloose/MyFin:abstractions
merge into: arran:abstractions
arran:main
arran:transaction-list
arran:abstractions
Collaborator
Copy link
No description provided.
Owner
Copy link

Awesome change on ec4994aa !

Awesome change on ec4994aa !
arran changed target branch from main to abstractions 2021年05月09日 20:32:11 +02:00
This pull request has changes conflicting with the target branch.
  • src/App.svelte
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 abstractions:phloose-abstractions
git switch phloose-abstractions

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 abstractions
git merge --no-ff phloose-abstractions
git switch phloose-abstractions
git rebase abstractions
git switch abstractions
git merge --ff-only phloose-abstractions
git switch phloose-abstractions
git rebase abstractions
git switch abstractions
git merge --no-ff phloose-abstractions
git switch abstractions
git merge --squash phloose-abstractions
git switch abstractions
git merge --ff-only phloose-abstractions
git switch abstractions
git merge phloose-abstractions
git push origin abstractions
Sign in to join this conversation.
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
2 participants
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
arran/MyFin!4
Reference in a new issue
arran/MyFin
No description provided.
Delete branch "phloose/MyFin:abstractions"

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?