grassrootseconomics
/
clicada
5
0
Fork 0
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

feat: Threaded resolution of txs and tokens #12

Open
lash wants to merge 11 commits from lash/thread into master
pull from: lash/thread
merge into: grassrootseconomics:master
Conversation 0 Commits 11 Files Changed 9 +360 -100
lash commented 2022-01-22 15:58:37 +01:00
Owner
Copy Link
No description provided.
lash added 13 commits 2022-01-22 15:58:37 +01:00
lash added 1 commit 2022-01-23 11:48:11 +01:00
lash added 1 commit 2022-01-23 11:48:54 +01:00
lash added 1 commit 2022-01-23 12:24:15 +01:00
lash added 1 commit 2022-01-23 13:36:34 +01:00
lash added 1 commit 2022-01-23 13:38:12 +01:00
lash added 1 commit 2022-01-23 13:43:36 +01:00
lash added 1 commit 2022-01-23 15:56:05 +01:00
lash added 1 commit 2022-01-24 09:48:39 +01:00
This pull request has changes conflicting with the target branch.
  • clicada/cli/arg.py
  • clicada/cli/user.py
  • requirements.txt
  • setup.cfg
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b lash/thread master
git pull origin lash/thread

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff lash/thread
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 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: grassrootseconomics/clicada#12
No description provided.
Delete Branch "lash/thread"

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?