Marco, this video was so good, I watched it twice. It's hard to make a video like this: short but not too short, meaningful examples without being overwhelmed by detail. You nailed it.
@MarcoCodes2 жыл бұрын
Thanks, Paul, really!
@hikingcloud9 ай бұрын
This channel is so underrated and under-appreciated. Marco is doing such a fantastic job!
@MarcoCodes9 ай бұрын
Thank you for the very kind words :)
2 жыл бұрын
Nice tutorial, I didn't know the third way of rebasing. You asked for favourite git tricks: select any two commits in the log (tree view) and select "Compare..." from the context menu. Very useful for e.g. to check whether the outcome of interactively rebasing and squashing a branch is identical to the original version.
@MarcoCodes2 жыл бұрын
Great tip! Thanks!
@dk-du8sm Жыл бұрын
Nice and concise video, good job. Two other great visual features that I like in IntelliJ are "Stash/Unstash uncommitted changes" and "Annotate with Git Blame".
@MarcoCodes Жыл бұрын
Yep, two very nice features as well!
@shubhamagarwal82976 ай бұрын
Thanks a lot subscribed
@santhoshsandy77922 жыл бұрын
Lovely tutorial Marco❤️ Thank you for this
@MarcoCodes2 жыл бұрын
Glad you liked it!
@equilibrium65772 жыл бұрын
Thank you, Marco! As always - very useful
@MarcoCodes2 жыл бұрын
Glad to hear that!
@gerhardat7244 Жыл бұрын
Great Video! I always used merge instead of rebase. This will change now.
@MarcoCodes Жыл бұрын
Great to hear!
@ayuobmousa65892 жыл бұрын
good show Marco kept going PRO
@pavelradkevich87262 жыл бұрын
Great job! Thanks a lot
@nisachannel70773 ай бұрын
When using the “pull into using rebase” feature, why did you choose the origin/main under remote branches and not the main branch under local branches?? A related question is, after the ‘pull’ command finishes, will “local” main be 100% in sync with origin/main under remote branches?
@mzalewski2 жыл бұрын
wow, great tutorial! Thank you! ❤
@MarcoCodes2 жыл бұрын
Glad you like it!
@KolosBros2 жыл бұрын
woow, third option for rebase is awesome!
@MarcoCodes2 жыл бұрын
Right?! For whatever reason I also only learned about it recently.
@marin14194 ай бұрын
@@MarcoCodes Third time's a charm :)
@AntonArhipov2 жыл бұрын
Very useful video!
@vadimdidenko14432 жыл бұрын
discovered you by just typing java logging reddit in google and ooooh booooooi Bro, you're f***ing saint!!!
@MarcoCodes2 жыл бұрын
:)
@DavidePavan2 жыл бұрын
Very useful!
@MarcoCodes2 жыл бұрын
Glad to hear that!
@YuriyKondrashov Жыл бұрын
Hi Marco Why did you abandon your "Marco Behler" channel and started a new one without saying a word? I accidentally found this one)) Consider making a short video there, I guess a lot of your viewers will be interested in this one. Actually I wanted to add a couple of notes regarding the force push. First one is an advice to make a 5 second pause when the force push dialog appears, reread the branch name, think if there is the latest version of the branch locally and only then press "Force Push" button. Because if the developer mess up at this point it could be hard to restore the lost commits. (Yeah I know about reflog but it has a quite steep learning curve IMHO.) Second it worth to mention if the developer does a force push on the branch and some other developer works on the same branch this second developer will be forced to do a hard reset on remote to synchronize the changes. Which is quite inconvenient especially if he has his own changes that are not yet pushed to remote. Or maybe you know some tricks how can multiple developers work with force pushes one the same branch?
@MarcoCodes Жыл бұрын
Hey Yuri, I guess since you are the ...fifth person or so asking I'll have to create a small video on the other channel which explains it :) Will do! Regarding force push. What I should have shown earlier in this video (and which actually comes _right after_) the force push section: In the IntelliJ log, you see that the "force push" button actually does a "force push --force-with-lease", which will protect against the scenarios you mentioned. (Though that won't help much if the user just clicks aways the next dialog windows that pop up, prompting him to potentially really force the push). Actually, I might just be tempted to create another short video just on the dynamics of pushing and the scenarios you mentioned, because there's much to be said about it. Thanks for your feedback!
@curry605 Жыл бұрын
About the first trick, it is nice to rebase and keep it a straight line when working on the feature branch alone. But if the feature branch is also shared with teammates, rebasing and force push to origin is a bad idea right?
@MarcoCodes Жыл бұрын
Yup, plain force pushes are. In that case you should _always_ --force-with-lease (which IntelliJ IDEA btw does as a default), but the more teammates you share your branch with, the more commits you have, that pretty soon is also no real option anymore.
@athakur332 жыл бұрын
Need more tutorials.
@MarcoCodes2 жыл бұрын
More more more :) ...are coming.
@skyfeelan Жыл бұрын
I just realized that git is almost as hard to use as vim
@marin14194 ай бұрын
Git is like a an operating system within an operating system.
@rieckpil2 жыл бұрын
Love the thumbnails #dontListenToRedditHaters
@MarcoCodes2 жыл бұрын
YOUR THUMBNAILS MAKE ME WANT TO STAB MYSELF IN THE EYES! ;)
@rniestroj2 жыл бұрын
Sayonara 😅
@no_fb2 жыл бұрын
Thanks, that's useful! I never saw the bottom right menu, it's strange they hide it so far away. A little remark, your face is hiding the most relevant part of the screen, though it was possible to read the essential information. Perhaps it would be better placed at the top right, and maybe smaller?
@MarcoCodes2 жыл бұрын
Glad to hear! We've had tons of discussions & opinions on face, no face, location etc etc. Usually it's in the lower right corner because there's not much happening there, for this video we had to put it on the left. We'll see what happens in the future :)