Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
E
eepm
  • Project
    • Project
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • etersoft
  • eepm
  • Merge Requests
  • !5

Merged
Opened Jan 26, 2026 by Иван Мажукин@vanomj 
  • Report abuse
Report abuse

epm ci: split branches to avoid collisions

Check out, review, and merge locally

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

git fetch https://gitlab.eterfund.ru/vanomj/eepm.git devel
git checkout -b vanomj/eepm-devel FETCH_HEAD

Step 2. Review the changes locally

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

git checkout devel
git merge --no-ff vanomj/eepm-devel

Step 4. Push the result of the merge to GitLab

git push origin devel

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

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

  • Discussion 0
  • Commits 3
  • Pipelines 14
  • Changes 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Иван Мажукин @vanomj

    added 1 commit

    • dc25b6e7 - epm ci: use package name instead of file path for default tests

    Compare with previous version

    · Jan 26, 2026

    added 1 commit

    • dc25b6e7 - epm ci: use package name instead of file path for default tests

    Compare with previous version

    added 1 commit <ul><li>dc25b6e7 - epm ci: use package name instead of file path for default tests</li></ul> [Compare with previous version](https://gitlab.eterfund.ru/etersoft/eepm/merge_requests/5/diffs?diff_id=12920&start_sha=fbdda60fce102ad07163c96dadea2b216f40d1cc)
    Toggle commit list
  • Иван Мажукин @vanomj

    added 1 commit

    • 45c42c03 - epm ci: change creds

    Compare with previous version

    · Jan 26, 2026

    added 1 commit

    • 45c42c03 - epm ci: change creds

    Compare with previous version

    added 1 commit <ul><li>45c42c03 - epm ci: change creds</li></ul> [Compare with previous version](https://gitlab.eterfund.ru/etersoft/eepm/merge_requests/5/diffs?diff_id=12921&start_sha=dc25b6e7549c509ef6ee21c2a80d1d26469be74c)
    Toggle commit list
  • Иван Мажукин @vanomj

    added 9 commits

    • 45c42c03...4c7b8334 - 6 commits from branch etersoft:devel
    • 28aa5ea8 - epm ci: split branches to avoid collisions
    • baf7b83d - epm ci: use package name instead of file path for default tests
    • 1556ce5c - epm ci: change creds

    Compare with previous version

    · Jan 26, 2026

    added 9 commits

    • 45c42c03...4c7b8334 - 6 commits from branch etersoft:devel
    • 28aa5ea8 - epm ci: split branches to avoid collisions
    • baf7b83d - epm ci: use package name instead of file path for default tests
    • 1556ce5c - epm ci: change creds

    Compare with previous version

    added 9 commits <ul><li>45c42c03...4c7b8334 - 6 commits from branch <code>etersoft:devel</code></li><li>28aa5ea8 - epm ci: split branches to avoid collisions</li><li>baf7b83d - epm ci: use package name instead of file path for default tests</li><li>1556ce5c - epm ci: change creds</li></ul> [Compare with previous version](https://gitlab.eterfund.ru/etersoft/eepm/merge_requests/5/diffs?diff_id=12923&start_sha=45c42c03f3146e0f67aa50b03a0c6a12e329d99e)
    Toggle commit list
  • Vitaly Lipatov @lav

    merged

    · Jan 26, 2026

    merged

    merged
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: etersoft/eepm!5