Network
×
Check out, review, and merge locally
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b network origin/network
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout DEV git merge --no-ff network
Step 4. Push the result of the merge to GitLab
git push origin DEV
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
There are merge conflicts.
Resolve these conflicts or ask someone with write access to this repository to merge it locally
0/0 discussions resolved
-
Arnau Comas Codina @marruixu added 2 commits
added 2 commits
added 2 commits * 84275444 - OpenStackError decorator for exceptions, minor change * d0818f18 - Network Interfaces [Compare with previous version](https://git.ik.bme.hu/RECIRCLE/interface-openstack/merge_requests/13/diffs?diff_id=1005&start_sha=5b8b9caedf8c561a70c34003fdb5161e15980076)Toggle commit list -
Arnau Comas Codina @marruixu added 2 commits
added 2 commits
added 2 commits * 36ed0e99 - Network Interfaces * a011c0fa - Network Interfaces [Compare with previous version](https://git.ik.bme.hu/RECIRCLE/interface-openstack/merge_requests/13/diffs?diff_id=1006&start_sha=d0818f1849fa06b3aabecff25529afb95f6a67b8)Toggle commit list -
Belákovics Ádám @Edi added 1 commitadded 1 commit * 5ee369c7 - Add code style and import changes [Compare with previous version](https://git.ik.bme.hu/RECIRCLE/interface-openstack/merge_requests/13/diffs?diff_id=1056&start_sha=a011c0fae91df65693475c8279d1d3e738619c33)Toggle commit list
Please
register
or
sign in
to comment