Skip to content

Instantly share code, notes, and snippets.

@oliveira-andre

oliveira-andre/readme.md

Last active August 4, 2018 21:29
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save oliveira-andre/174ed41f5366e6d9ccf80d0c341aea56 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save oliveira-andre/174ed41f5366e6d9ccf80d0c341aea56 to your computer and use it in GitHub Desktop.
Download ZIP
readme.md for gitlabs
Raw
readme.md

Branches

  • andre
  • master (just push with merge request)

To push your branch to your machine

git checkout -b <branch>

To push your branch to project

git push -u origin <branch>

Merge request

https://gitlab.com/<example_group>/<example_project>/merge_requests/new?merge_request%5Bsource_branch%5D=<branch>)
(change the <branch>)

Solving the merge request

step 1. Fetch and check out the branch for this merge request
git fetch origin
Step 2. Merge the branch and fix any conflicts that come up
git checkout master
git merge --no-ff <branch>
Step 3. Push the result of the merge to GitLab
git push origin master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment