User sublime merge for differential3/9/2023 ![]() In the meantime, you kind of check out #7a for a while, then go back to #6, then swap over to #7b. You’ve got two branch options, and you can decide any time. Next minute though, you have total writers block! Well, it’s not that you can’t come up with anything, it’s that you’ve got two new change set (/sentence) ideas, and you’re not sure which is better… doh! Ain’t ready to put them on your own main copy, what do? Hey, what if you don’t touch the main trunk you got going, but you just sort of store #7a and #7b on the side: Just like that, your friend, master, and you are all up to speed together. This creation is coming along! You both agree to add it to master, and then you also fetch a copy of #5, #6 from master to your local copy. You come up with #4, add it to your copy, and you both agree to put it into the master copy. That friend is freakishly efficient… “Tadaaaaa!” they say: “” - #1 - #2 - #3 the new, master copy.įor a time all is well. So you’re like “My dear friend, I ain’t gonna step aside, but let’s make a third copy of this creation, and let that be the master: don’t want no clash of ego’s here….”. What are they thinking? You’re a little less confident though. The problem is your friend is getting a bit like “After this, I’m soooo the master”. The cool thing is that after this change your friend has their own copy because they had used your instruction book to get to #2, and then created #3 on top of that. I’m going to bring that change across, and commit it to my master creation. They’re like “sweeet, awesome, I’ll be back”.įrom “Let me tell you about git” To “My sentence is so much cooler” #3Īnd you’re like “That soooo fits. ![]() In order to resolve this merge conflict, you tell them “look, how about you take all of my sentence history, and use that as a base, and then just change your change set to work on top of it. They’re super disappointed, but you are the master, and you just ain’t going to take that treatment. I’m currently at “Let me tell you about git”. That piece ain’t going to fit onto the top of my sentence history at all. They come along and are like “Hey dude, I saw your empty sentence and I wanted to change it with this change set:”įrom “” To “My sentence is so much cooler” #3 (conflicted)Īnd you’re like, “Madam, that was so yesteryear. You have an instruction booklet from the beginning of time when there was nothing to your latest and greatest creation.Īll the change sets have to apply on top of each other. Git works the same.Įach time you commit a new piece to your creation, it’s true you’re creating a new snapshot of your creation at that moment in time, but you’re also adding an instruction of how you got to that state from the previous one. When you’re stacking lego piece by piece, and you create the new pieces as you go, it is a process of designing the new lego piece, adding it to your lego kit, and then committing it to your lego creation. ![]() #2 will be like “bro, I only go from “This is the first sentence in my git repository”. It takes change sets, and stacks them on top of one another, but the bricks have to fit! It’s no good starting with an empty sentence “” and trying to smash #2 on top of it. Wow, with this second change set (#2) we can go from an empty sentence, all the way to “Let me tell you about git”. As long as you give me an empty sentence, I can ‘apply’ the change set to get “This is the first sentence in my git repository”.įrom “This is the first sentence in my git repository” To “Let me tell you a bit about git” ![]() From “” To “This is the first sentence in my git repository”Ībove is a change set (#1).
0 Comments
Leave a Reply.AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |