Skip to content

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

Merged
Opened May 19, 2021 by Kim Peace@kim-p 
  • Report abuse
Report abuse

Features/1.3.101

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b features/1.3.101 origin/features/1.3.101

Step 2. Review the changes locally

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

git checkout features/1.3.200
git merge --no-ff features/1.3.101

Step 4. Push the result of the merge to GitLab

git push origin features/1.3.200

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 4
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kim Peace @kim-p

    added 38 commits

    • 3fd5430d...96f79ab9 - 37 commits from branch features/1.3.200
    • 0b0dd23a - Merge commit '96f79ab9' into features/1.3.101

    Compare with previous version

    May 19, 2021

    added 38 commits

    • 3fd5430d...96f79ab9 - 37 commits from branch features/1.3.200
    • 0b0dd23a - Merge commit '96f79ab9' into features/1.3.101

    Compare with previous version

    added 38 commits * 3fd5430d...96f79ab9 - 37 commits from branch `features/1.3.200` * 0b0dd23a - Merge commit '96f79ab92fbd505f7b9563028dbc674707b9ba09' into features/1.3.101 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/151/diffs?diff_id=6272&start_sha=3fd5430d7a3b752df474c82178d79e9cdb029015)
    Toggle commit list
  • Kim Peace @kim-p

    mentioned in commit df73f243

    May 19, 2021

    mentioned in commit df73f243

    mentioned in commit df73f243677485578c7538432341d6e26ac237fc
    Toggle commit list
  • Kim Peace @kim-p

    merged

    May 19, 2021

    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
1
1 participant
Reference: abook_android/abook_check!151
×

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.