I spent years thinking "isn't there some information I'm missing here??" before I discovered git's `diff3` conflict style. It's insane to me that git just shows you the result of each change (not what it was beforehand) by default. I don't know how anybody is merging anything like that. Vscode's merge tool makes this even easier 👍 I've been very excited seeing it roll into the product, knowing "proper" merge conflict resolution will be available to so many people now! I just wish the base view was enabled by default.
@code
Жыл бұрын
I didn't know about the "base" either until I made that video. And I've been using git for at least 10 years. Glad you like it!
@PeterNeave
Жыл бұрын
I'm always amazed what VS Code can do. Can it resolve other types of conflicts? tabs vs spaces, blonds vs brunettes, Ukraine vs Russia, etc?
@bslayerw
Жыл бұрын
it has a problem with tabs vs spaces (jk), it should resolve the other conflicts fine, but will need a couple of plugins haha
@RaineWilder
Жыл бұрын
I wasn’t aware of blondes vs brunettes conflict. What’s in the base branch?
@hemanthkumartirupati
Жыл бұрын
Thank you Vscode team. These videos are extremely helpful. Keep making technical/educational videos
@code
Жыл бұрын
Thanks for the feedback! Glad it was helpful as it was not at all easy to make. But worth it!
@jscobie4
Ай бұрын
Just learning how to turn on the base window was worth its weigh in gold. I can't believe I've missed that all this time.
@DevLeonardo
Жыл бұрын
I released a video about how to handle a conflict on vscode like... last week! But I didn't know we had the base branch view. Thanks for sharing! Good thing that I already have a wide monitor to fit all those panels 😅
@code
Жыл бұрын
What's your video link? We'd be happy to RT or help promote. The more content the better!
@DevLeonardo
Жыл бұрын
@@code Hey! That would be amazing! ❤ Acutally, I think I already replied to this comment but I suppose comments with links are automatically hidden/deleted, so... let's find another way without the link 😅 If the last comment was deleted, you can find the video on my channel, it's called: Resolve Merge Conflict in Visual Studio Code (2022 Update!) Aaaand if you have 5 more minutes, a month ago I also released a video where I introduce how to contribute to the vscode repo on github, with title: How to Contribute to Visual Studio Code - 8 PRs Accepted Thank you!!
@markvogt70
Жыл бұрын
You EARNED A NEW SUBSCRIBER from this immensely-useful (and timely!) video ! Well done you! -Mark in North Aurora IL
@mmikhan
Жыл бұрын
Oh boy! Give this man a raise 👌
@RichardNobel
Жыл бұрын
queue 🎵 Meghan Trainor - All About That -Bass- *BASE* 😉 ( 4:18 in the video ) On topic: VS Code keeps getting better! Thanks for pointing out the "Show Base" and "Accept Combination" features. 👍
@valp_co
19 күн бұрын
I love this kinda of content, being able to smootly go over git, allow me to go faster and confident. thanks for this content, great job.
@code
15 күн бұрын
what a kind thing to say! thank you so much for the note.
@WaldirPimenta
Жыл бұрын
I'm pretty comfortable with using git on the terminal, but the new "Accept Combination" feature has been very helpful so far! It does feel a bit magical and I keep double-checking its results to make sure it didn't mess up, but I guess git's own automatic conflict resolution is already a piece of "magic" that I accept, so it's only fair that this is merely an extension of that. I hope this work can be upstreamed back to git!
@attilapinter7141
Жыл бұрын
Yep, exactly the type of parties we have at the openSUSE Bar so thanks for the ammo ^-^
@phatdad66
Жыл бұрын
I can't tell you how many years I have tried or wanted to learn how to program just even the simplest of code but between just the terminology and gooeys of everything altogether it was such a whirlwind I could never wrap my head around it and by anytime I started making some progress whatever free trials cider video I was watching hit a massive pay wall and it was generally after hours of hard work and at that point you barely learned anything and you want to punch yourself in the mouth. What he just taught me in the last two lessons or only two lessons of this beginner tutorial for visual studio code and GitHub is it literally she'll shocking me right now in a great way and also quite a face-palming way as well as I think back of all the years of things are now making sense to me and what went wrong all those times I don't even know who to thank or how many times I could thank them for creating this video and putting it in whatever search terminology seoi happen to type today but just know I do and I'm pretty sure that feeling will grow exponentially
@bslayerw
Жыл бұрын
I also like these short bit sized videos that I don't have to set 30 minutes or more aside for.
@planetoftheweb
Жыл бұрын
Well done video bud. Love the stickies! The new Merge tool is one of the best additions to VS code in a long time.
@code
Жыл бұрын
Hi Ray! 👋
@martin9755
Жыл бұрын
The title of this video is actually justified. It IS extremely helpful.👍
@SJMilnor
Жыл бұрын
Thanks! Those notecards with shapes on them representing commits were a great illustration.
@psr-pk7db
Жыл бұрын
Thanks a lot.. now my issue is resolved and understood the merge-conflict concept well.
@code
Жыл бұрын
Wonderful!
@halopinx3398
Жыл бұрын
From a webstorm ide I need to change to VS Code. This explains very well on how to merge conflicts on VSCode. Thank you!
@tharinda
8 ай бұрын
The one that pulled the triggers for me. Well explained! 🙏
@YiuMingLai
Жыл бұрын
yes, very useful feature I have been rebasing my code change every day waiting for code review.
@bsewall
Жыл бұрын
Makes it so much simpler! Thanks for the tip!
@Carsono5
Жыл бұрын
Oh, how I struggle with this. But now I understand a bit more about the dark art of merging conflicts.
@fokeyjo
4 ай бұрын
Liked your presentation methods! Great to see VSC does have the base view now, but I still don't think it'll move me away from Beyond Compare!
@shooding
11 ай бұрын
saved me a lot of time opening the resource-consuming source tree (If and only if the project is developed under VSCode)
@safirmohammadshaikh6052
2 ай бұрын
Thanks, a sigh of relief after watching this!!!
@sanjayplays5010
Жыл бұрын
Now that's a title that actually fit the content ;) Cheers for the explanation
@allgon6248
Жыл бұрын
I gave a like to this video because the visual demonstration in the beginning. 👍
@ddtddt55
5 ай бұрын
This is a best video that explain how to resolve merge conflict. 👍
@the_real_foamidable
Жыл бұрын
This was EXTREMELY helpful as advertised!
@Norfeldt
Жыл бұрын
How did you know I like to talk about this at parties😮 are you tracking me?! ❤ The content ❤
@edh9500
Жыл бұрын
This video is a superb headache saver. Thank you!
@innigaadu
Жыл бұрын
Great Explanation !! I could not have asked for anything better
@BruceElgort
Жыл бұрын
This was an excellent demonstration! Thank you for it.
@MuhammadAlam-ne9cf
Жыл бұрын
wow the video title wasn't lying!!
@bslayerw
Жыл бұрын
Awesome video. This really clear it up for me. I'll be using git in vscode a lot more than my third party git client.
@michaelm8044
Жыл бұрын
Very helpful, thanks VSCode!
@code
Жыл бұрын
You are welcome, Michael M
@MarkvanBuskirk
Жыл бұрын
Get a conversation going about how you've been working on getting better at "threeways" and you have done them enough that you're much more comfortable with them now.
@kumarraja1989
Жыл бұрын
Thank you, really helpful to understand new merge editor in vscode
@AndrzejPauli
Жыл бұрын
Toootally I will brag about this video. In fact I'm gonna share it with my team :-)
@BartvandenDonk
Жыл бұрын
Thanks for the complete explanation.
@StephenMoreira
Жыл бұрын
Amazing. 10/10
@patrickjustice7371
Жыл бұрын
Jetbrains IDEA has had similar merge window for about 20 years. Good job, microsoft. I don't understand why microsoft couldn't add side by side merge window to vscode from the begining.
@dodi981
Жыл бұрын
Well explained . Thanks. Great job.
@Mysteria9
9 ай бұрын
Superb video!
@tranquiloteov
Жыл бұрын
Awsome video. Thank you from Spain
@papunmohanty5968
Жыл бұрын
cool, if base goes in the middle, I am buying new 32 inch monitor awesome feature 😎
@danielschwartz516
Жыл бұрын
was looking for that base, Tnx.
@1off271
Жыл бұрын
Use code lens (take current/their) & default vscode editor, it's enough, you don't need 3 window for this. To see parent use - `conflictstyle = zdiff3`
@malipetek
Жыл бұрын
Only git command I use from terminal is git merge --quit For anything else I use git graph extension. It is so essential for me.
@arindam-karmakar
Жыл бұрын
When the new merge editor came out, it seemed very confusing to me. I found it difficult to use because, the diff in vscode does not always corresponds to the exact lines of changes between local and remote, so I turned it off. I might give it another try after watching this video.
@CsabaKissColorado
Жыл бұрын
Fantastic explanation. Thank you!
@serhioromano
Жыл бұрын
Now it really make sense.
@twigan
11 ай бұрын
Thanks, this video does an excellent job explaining this. I never realized you could easily compare right to the base. I've always used git blame to see what each side did manually - what a chore. This will make it so much easier. Is this ability to open all four panels in Visual Studio proper?
@jonathanclark1178
Жыл бұрын
I learned lots -- great video.
@ThomasBurleson
Жыл бұрын
This is why you should ALWAYS rebase before a PR and before merging. And... squash your feature branch commits to make any conflicts easy to resolve.
@austinZen8800
Жыл бұрын
this sounds like it may be very helpful but can you please explain how a rebase and squash help with with potential merge conflicts?
@abhishekmali2289
Жыл бұрын
Any video/article on this to refer ?
@Kayotesden
Жыл бұрын
Squashing feature branch commit is a terrible suggestion. More appropriate to reorg the commit (reword, squash etc some for better organisation). Commits serve a purpose of identifying what chunk of work was done. I would hate to review such massive commits as per suggestion...
@ShayanDavoodii
Жыл бұрын
What's the meaning of rebase?
@Massimus888
Жыл бұрын
@@zaka8315 it sure works even if changes have been pushed to remote. The issue 'can' arise if you are multiple people working on the same feature branch, but this can also be easily solved. Squashing commits on a feature branch can also come in handy. When writing code, things always get messy and changes are added, modified and removed through commits. Rebasing commits on a feature branch by squashing commits can create a cleaner history of the commits for the reviewer of the PR and those looking through the master history.
@alashi520
Ай бұрын
05:41 的意思是說 當我們已經調整完(accept changes),但我們反悔,不想accept this change,我們就"remove current"
@JuiceRabbit
Жыл бұрын
Excellent! 👍
@kevinconde5528
5 ай бұрын
Fantastic!
@amalkrishnas1696
Ай бұрын
thank you , very helpful
@yassineelaissaoui2541
Жыл бұрын
Thanks, this is well explained 🙏
@ThomasGulsever
Жыл бұрын
thank you , great video well explained
@johnston777
3 ай бұрын
what is extension to support this? my interface is quite different with yours. there are no option like "accept incoming change" etc.
@futuza
10 ай бұрын
Any strategies/suggestion for when you have thousands of merge conflicts to compare and only understand some of the commits?
@ioanabiris3472
9 ай бұрын
Thank you very much!!!
@savimcgee7443
10 ай бұрын
Thank you!
@AnythingGodamnit
9 ай бұрын
This looks great but I don't see any "Resolve in Merge Editor" button - I just see the original merge conflict UI with no button.
@AnythingGodamnit
9 ай бұрын
Ah, nevermind. I had opened the file on its own. I had to open the parent repository before the button showed up. I guess that makes sense because some of the info required for 3-way diff would be in the git repo...?
@kishoreandra
Жыл бұрын
Thanks Burke 🙏
@mitz8892
7 ай бұрын
nice explanation, but why your iris is showing square ? 😉
@tylerhartman1630
Жыл бұрын
Okay... I fell like I'm going crazy here, but here goes... In the code he's merging, the log will tell you that the params are all being set to equal each other, but that isn't the case in the 'current' block. By setting param1 = param2 and then changing param2 = param3, you ensure that param2 and param3 are equal, but param1 is holding the value left by param2... Am I going crazy?
@narutokunn
Жыл бұрын
Thanks for this
@HDdeiu
Жыл бұрын
thanks this was very helpful
@YashSharma-qo1sy
5 ай бұрын
Thanks
@easyhandmadecraft2337
Ай бұрын
Super
@osamasalama6133
6 ай бұрын
why vscode not show conflict window ?? any help
@zapy422
3 ай бұрын
shouldn't base be enabled by default?
@kajautus
7 ай бұрын
My problem: Do stuff -> commit Do stuff2 -> commit Ohno, need to fix stuff in in commit. git rebase -i HEAD~2 e stuff pick stuff2 Do changes! Git commit --amend etc. CONFLICT! Now I have absolutely no idea what is meant with incoming or current. Do I always select the "best" option or what? Do I end up with stuff + things from stuff2 - commit stuff2 commit or what.. Send help.
@akshimmu
Жыл бұрын
Git mergetool --tool=(beyond compare/meld/ any comparison tool)
@avanreijn
Жыл бұрын
All your base are belong to us!
@averma12
5 ай бұрын
This seems like vscode accepting Jetbrains merge editor as the way to resolve merge conflicts
@ckat609
Жыл бұрын
It's all about the base
@riku5543
Жыл бұрын
Based
@rprLKA
Жыл бұрын
Of course, I'm going to brag about this at parties.
@codycodes
Жыл бұрын
This whole time VS Code was abstracting the base commit away from us 😂
@code
Жыл бұрын
🫣
@coolmind2476
6 ай бұрын
Great explanation. But whoever invented git and the Integration in vscode didnt design it properly, its very confusing and error prone. Actually I think it should not be allowed that two peole work simulateously on the same line of code, there should be a kind of locking concept. If someone wants to edit a file it should be locked for other developers to avoid conflicts.
@Jonathan-rm6kt
14 күн бұрын
I think you might be missing the point a bit. There's no way of knowing who is working in the same line until there's a commit. Any implementation of that, exaggerated, would eventually just be a live coding pad. For as much as i despise the confusing nature of Git, it really is an elegant solution to this problem.
@honefone
Жыл бұрын
thank god for abort merge
@primemate5673
Жыл бұрын
code ai guide please
@ndk8111
Жыл бұрын
Sorry. You lost me on the concept. Thank you for trying though.
@marufhassan634
Жыл бұрын
Its really bad implementation on the part of VSCode and I absolutely hate this. 1. The good functionalities are hidden inside the dropdown icon. 2. In smaller screen such as 13 inch laptop, this isn't helpful as I have to constantly scroll horizontally continuously to check the change. 3. Smart merge button is hidden. Android Studio handles this in the most efficient way by opening a window and decreasing the font size and giving all the options in the top as icons. Press smart merge and it will merge the possible merges which doesn't require your attention. Just press → to accept changes for the lines you want and x to discard them. I hope VSCode also just copies that system or gives an option to display in a seperate window.
@chri-k
Жыл бұрын
the better option may be to just open all 4 “files” in separate windows
@code
Жыл бұрын
Hi Maruf! Thank you for taking the time to make these suggestions. I've passed this on to the engineer working on the merge editor experience. We can always improve so we appreciate that you took the time to let us know what you'd like to see. Cheers!
@saber8387
3 күн бұрын
Bruh this simple "Abort merge" made me rage quit coding for a week
@andgate6204
Жыл бұрын
I really hate the new editor. Just let me edit text. I don't want to mess around with a slow, clunky interface.
@ChrisBohling
Жыл бұрын
If you are saying that VS Code just now discovered the concept of base, that’s not really a positive.
@labombarde1
6 ай бұрын
Git .. the Muddiest Splash Page ever made. It really doesn't need to be this cryptic and difficult to use a memory card. smh
@MagicBoterham
Жыл бұрын
If you like this comment like this comment, like this comment.
@kapilkumar-vi1nt
Жыл бұрын
Hey bro what do you help me from AdSense loading or AdSense loading methods
Пікірлер: 120