Wroclaw/GPTcord
1
0
Fork 0
Code Issues 7 Pull requests 1 Releases Activity

WIP: User descriptions for users #18

Draft
Wroclaw wants to merge 3 commits from feature/user-decriptions into main
pull from: feature/user-decriptions
merge into: Wroclaw:main
Conversation 0 Commits 3 Files changed 3 +25 -12
Wroclaw commented 2023-09-28 11:43:39 +02:00
Owner
Copy link

will fix #15

will fix #15
Wroclaw added 2 commits 2023-09-28 11:43:40 +02:00 
This will be used for fetching user descriptions very soon
Wroclaw added the
enhancement
 label 2023-09-28 11:44:11 +02:00
Wroclaw added 2 commits 2023-11-13 21:12:41 +01:00 
to development util on nixos system
Wroclaw force-pushed feature/user-decriptions from dc828b6421 to 2b2bab9d51 2023-12-13 17:12:38 +01:00 Compare
This pull request has changes conflicting with the target branch.
  • src/execution.ts
  • src/funcitonManager.ts
View command line instructions

Checkout

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

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 main
git merge --no-ff feature/user-decriptions
git checkout feature/user-decriptions
git rebase main
git checkout main
git merge --ff-only feature/user-decriptions
git checkout feature/user-decriptions
git rebase main
git checkout main
git merge --no-ff feature/user-decriptions
git checkout main
git merge --squash feature/user-decriptions
git checkout main
git merge --ff-only feature/user-decriptions
git checkout main
git merge feature/user-decriptions
git push origin main
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: Wroclaw/GPTcord#18
No description provided.
Delete branch "feature/user-decriptions"

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?