038 Gitlab Merge Request Merge Methods

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.

[is-gmhg]

This video is great! Thanks a lot! Dan, please never die!

[Atillahuno]

This is exactly what I was looking for. Cheers!

[jonnykopp]

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.

[maxjf]

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,

[sushislushy]

how does merge request's downside happen (break master), if the commit branch tip and the new master commit are both the same?