Skip to content
  • This project
    • Loading...
  • Sign in

Administrator / chatgpt.ai-pro.org

Go to a project
Toggle navigation
Toggle navigation pinning
  • Projects
  • Groups
  • Snippets
  • Help
  • Project
  • Activity
  • Repository
  • Pipelines
  • Graphs
  • Issues 0
  • Merge Requests 3
  • Wiki
  • Network
  • Create a new issue
  • Builds
  • Commits
  • Issue Boards
Merged
Merge Request !27 opened 2023-02-16 03:50:05 UTC by Jeff@Cosico

jeff_fix_maxtoken

Edited 2023-02-22 04:38:47 UTC
Request to merge jeff_fix_maxtoken into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b jeff_fix_maxtoken origin/jeff_fix_maxtoken

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff jeff_fix_maxtoken

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Merged

The changes were merged into master.

  • Discussion 0
  • Commits 6
  • Changes 1
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Jeff
    @Cosico

    added 1 commit

    • ec12f544 - jeff_fix_maxtoken

    Compare with previous version

    2023-02-16 04:40:16 UTC

    added 1 commit

    • ec12f544 - jeff_fix_maxtoken

    Compare with previous version

    Toggle commit list
  • Jeff
    @Cosico

    added 2 commits

    • aba61c3d - jeff_fix_maxtoken
    • 28a81d8e - Merge branch 'jeff_fix_maxtoken' of https://gitlab.baytech.ph/baytech/chatgpt.ai…

    Compare with previous version

    2023-02-16 05:43:33 UTC

    added 2 commits

    • aba61c3d - jeff_fix_maxtoken
    • 28a81d8e - Merge branch 'jeff_fix_maxtoken' of https://gitlab.baytech.ph/baytech/chatgpt.ai…

    Compare with previous version

    Toggle commit list
  • Jeff
    @Cosico

    added 1 commit

    • b8c46df5 - jeff_fix_maxtoken

    Compare with previous version

    2023-02-16 06:16:55 UTC

    added 1 commit

    • b8c46df5 - jeff_fix_maxtoken

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    unmarked as a Work In Progress

    2023-02-22 04:26:40 UTC

    unmarked as a Work In Progress

    Toggle commit list
  • Ryan
    @ryan

    changed target branch from 26905_erro_guide_2 to master

    2023-02-22 04:27:55 UTC

    changed target branch from 26905_erro_guide_2 to master

    Toggle commit list
  • Ryan
    @ryan

    added 14 commits

    • b8c46df5...5d77d99f - 13 commits from branch master
    • 4e4163e2 - pull latest

    Compare with previous version

    2023-02-22 04:37:48 UTC

    added 14 commits

    • b8c46df5...5d77d99f - 13 commits from branch master
    • 4e4163e2 - pull latest

    Compare with previous version

    Toggle commit list
  • Ryan
    @ryan

    merged

    2023-02-22 04:38:46 UTC

    merged

    Toggle commit list
  • Ryan
    @ryan

    mentioned in commit 94593dd1

    2023-02-22 04:38:47 UTC

    mentioned in commit 94593dd1

    Toggle commit list
  • Write
  • Preview
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: baytech/chatgpt.ai-pro.org!27
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.