No video
038 Gitlab Merge Request Merge Methods
Рет қаралды 12,614
Күн бұрынToday I explain all three merge methods for Gitlab projects and show exactly how those choices affect the commit tree. To change to the merge method go to your project page and click Settings / General / Merge Request.
UPDATE 9/2019: In this video I touch on Gitlab CI not being able to test the merged state of a topic branch. This is technically no longer true, see new enterprise feature: docs.gitlab.co...
If you are looking for an effective concise introduction to Git, I highly recommend my "Fundamentals of Git" course on Udemy: www.udemy.com/...
If you or your company is interested in live virtual software and tools training, see www.continuous... for a list of training topics we offer.
@Atilla8huno 4 жыл бұрын
This is exactly what I was looking for. Cheers!
@jonnykopp 5 жыл бұрын
Hey Dan. Thank you so so much for these videos. You're answering questions that have blurred my understanding for years. I would love to see some videos targeting the various workflows(gitflow, githubflow, and I heard you mention a rebase flow, I'm sure there are more), possibly with 2 example contributors and a third qa authority's perspective for each of the workflows. Would be nice to at least get a clear overview of how they differ, and their strengths vs weaknesses. Thanks again for all the work you put into these.
@DanGitschooldude 5 жыл бұрын
Thanks buddy, glad you enjoy the videos! I've considered videos on different workflows but find it difficult to summarize the pros and cons in a useful way. In my experience the best workflow is different for every team and there are so many factors to consider like: team size, testing time, deployment process, developer's knowledge of git, network constraints, etc. I'll think on it some more though, you aren't the first person to make this type of video request. Thanks for watching!
@is-gm6hg Жыл бұрын
This video is great! Thanks a lot! Dan, please never die!
@DanGitschooldude Жыл бұрын
Lol I'm still alive!
@is-gm6hg Жыл бұрын
@@DanGitschooldude it is an expression we use in Argentina to empathize the importance of an individual, or how much it is beloved. Thanks again for your efforts to illuminate us
@nir8924 5 жыл бұрын
Much appreciated mate, thanks !
@user-tz8mi9hn1l 3 жыл бұрын
Awesome video.
@maxjf1 2 жыл бұрын
Thanks for the video. Currently i'm having problems with merge requests because i need to rename a folder foo to bar and change it (keeping it history), and also create a foo folder, wich is a backup of the old foo, and it doesn't need to keep history (but it's good to if possible) the problem is, when i create an MR for this and merge it, somehow gilab smashes everything and thinks the bar folder is a new folder, not the renamed foo, and i lost all the history of foo in it. i disabled squash commit,
@DanGitschooldude 2 жыл бұрын
This is normal git behavior and doesn't have anything to do with gitlab. Git doesn't track directories it tracks files. If a new file looks like an old file path content-wise, git may detect it as a rename, but this isn't explicitly definable by the user and isn't always consistent. Whether a new file is detected as a rename or a brand new file depends on a number of factors. Thanks for watching!
@sushi2slushy 4 жыл бұрын
how does merge request's downside happen (break master), if the commit branch tip and the new master commit are both the same?
@sushi2slushy 4 жыл бұрын
or is it because the source branch "passes" but in reality would have cause conflict on the merge request, versus rebase/fast foward forces you to resolve them on the spot
@DanGitschooldude 4 жыл бұрын
Basically yes. Unless you have configured the project to require fast forward merges, the tip of the source branch is not the same state of code as the merged state.
@sushi2slushy 4 жыл бұрын
@@DanGitschooldude Thanks Dan!
Dan Gitschooldude
Рет қаралды 2 М.