GitLab CE Tutorial #6 - Merge Requests

Support Free Tutorials

The best shared web hosting

Subscribe to Level Up Pro for extra features!

Subscribe to the Level Up Newsletter

To Support Level Up Tuts:

Simple cloud hosting, built for developers.:

Build together: GitLab includes Git repository management, code reviews, issue tracking, wikis, and more, plus GitLab CI, an easy-to-use continuous integration and deployment tool.

Stay up-to-date: Collaborate with your team using issues, milestones, and line-by-line code review. View activity streams of projects or the people you work with.

Plays well with others: GitLab seamlessly integrates with Slack, Hipchat, LDAP, JIRA, Jenkins, and many other popular tools. GitLab includes many webhooks and offers a complete API.

GitLab Community Edition is open source and completely free to download. GitLab is powered by a community of more than 1,000 people.

GitLab Enterprise Edition offers deeper LDAP and Active Directory integration, Jira and Jenkins integration, and much more.

[sumant]

Your Microphone setup is awesome ... Great Tutorial, clarified my doubts.

[yash]

0:26 that blackish bar color is looking nice

[cn-ml]

Instead of comparing the branches you can also just view the changes tab in the merge request directly.

[phamtrunguc]

Hi Scott,
Thanks you for your helpful video.
I would like to ask you, how to merge two branch to master branch, of course two branch have conflict code.
Have a nice day, Scott.

[gustavotorres]

Hi Scott,
Thanks a lot, your video was really helpful.


Grettings from Perú

[jimmihenry]

Have some 3D files and footprints for KiCAD that i would like to have merged into the library how do i request that???

[obendesmond]

got a question please. If i pulled from gitlab yesterday and my cheif tech guy updated and pushed today
and then what will happen if i push immediately after he pushes?? will it just add my updated code
to the repo without overriding the guys own new code?? or will it override. Thanks

[rshariffmohammed]

I would like to ask you, when i push changes for merge request, the admin of that repo needs to approve for merge req right?. So for second time what if i amend same commit using "git commit --amend --no--edit" will it get merge automatically or it need admin to approve the req. it will be great if you can help me out

[acatcommunication]

Hey Andrew, it's been a long time since React ! Nice to see you again

[kritinsamazingworld]

How to get the suggestions when you type in terminal?

[ashwinkraj]

What merge strategy and strategy option is used by Gitlab in a merge operation? I have files with conflicts, so does Gitlab prompt a resolution before the merge is completed?

[rbaleksandar]

This is somewhat misleading. At least for my case I don't have access to the fork so clicking on reviewing and comparing the changes does not work (error 404 since no access means no visibility). How would you do that if you are not owner of the fork?

[sanrasaan]

Can we merge a branch from one project to another branch on a different project?

Thanks,

[DalasYoo]

I wish we could check whether there is a way to do merge request with command line without setting all those by ourselves

[jonasmellquist]

What's that wicked git autocompletion you have running? :)

[yafessahin]

What shell are you using? And why is your autocomplete so cool?

[defcello]

How is this process different in the Enterprise Edition?

[SNs]

what to do if we want to assign it to multiple people?

[ranjitw.]

Hi, while merging a code from updated-code branch to master, how to exclude a file that I do not want to merge from updated-code branch to master ? Excluding JenkinsFile that I have written to trigger pipeline job for each branch help me differentiate pipeline.. Hence could you plz help me??

[PeterCrimmin]

This video shows a successful workflow with little explanation. For example, you can click "unsubscribe from notifications" to unsubscribe from notifications. How does that help? IMHO, the video could be better planned. Instead, it's an off-the-cuff presentation by a knowledgeable person.