GitLab Digital Experience, 25 Mar 2021

Previous Meeting Next Meeting

⏯

youtube image

►

From YouTube: Fixing merge conflicts locally for www-gitlab-com

Description

A quick walk through on how to fix merge conflicts locally for the www-gitalb-com repository.

A

Hello barker here we're gonna walk through how to fix, merge conflicts, and I have a couple, mrs um with this issue this morning, so I thought I'd just make a quick video walk through it. We're gonna walk through this, mr and, as we can see, we've got this nice little message saying there are merge conflicts, please merge locally.

A

If you click on this button, it's going to give you instructions, but those don't actually work, because you can't push to master. We definitely don't let you do that. You got to be like super master, to get those powers, um so we got to merge locally, so I'm gonna come over here copy. My branch drag that screen off over. Here I got terminal idd, ide open.

A

I'm gonna check out my branch. um I always I'm not gonna do get fetch, but I always like to start the day with a get fetch and then get status, see where I'm at okay, I'm on the branch. I did a get fetch this morning, so I'm good, um but now we need to rebase with master, so we're gonna go, get rebase origin, slash master, and this is gonna.

A

Take our master branch, put it on this branch and then stack all the commits that have been made on top of it makes for a clean, get history and it does some stuff- and we can see here- is our conflict file right here. Sites handbook source handbook, marketing, strategic marketing use case blah blah blah. So um I'm gonna drag this over here, but I gotta find that file now in my ide, because git is telling me there's something wrong sublime: has this cool little? You can see the icon and it'll tell you.

A

You know kind of lead, you down the rat's nest and you can see okay right here, ci boom, here's the file. If I scroll down this file at some point, I should see the conflict.

A

Oh gosh. This is a really big file.

A

ah There it is yeah, well, that's buried. This is a hard one, um so this where it starts head down to here. This is what's um on master branch right here and then below it. This is that same section, but this is what is done on this branch, um because our master branch is master and I'm not up to date with the changes that were made in this specific, mr I'm going to go with the changes that are on master and I'm going to remove these changes.

A

You also got to make sure you remove the top part of that commit or the the head changes save the file in your ide, and then we come back over here to uh terminal get status.

A

Here's all of these changes that came in from when we rebased, but we can see here, is the change for the conflict that we've just done so and we can see in our terminal we're still doing our git rebase continue.

A

So at this point all we got to do is get ad add all of those changes, including the one we just made and all the ones from the rebase and then we run git rebase dash dash, continue, whoa, look at that all green.

A

Now we're good copy, my branch name and now we're gonna have to do push it back up now we might have to do a super special command here, because I'm we've just kind of reset our branch, and I think it's going to give us a little warning saying you can't do that, um but we got to wait for it yeah. So now we get a little bit of red and it's saying hey, you can't do it because the tip your branch is behind.

A

So I always get my commands sometimes um confused of whether or not it's a get force or a hard. uh But it's a force.

A

So now we gotta force push our branch up to origin and that's saying: hey screw your branch up on git lab use my branch, it's kind of a cool one, get push force, origin branch and that is going to make our branch on gitlab be exactly like the one I have down here that I just really patched up with master, be careful with that force command because you could really screw up someone else's work if you guys are working on the same branch um in this case.

A

I know I'm the one patching up this one so and I made sure my local branch was just like origin before I started.

A

So I think it's okay, but it could not be always got to be careful with force um so and just to show here it takes a while to push our stuff up depending on internet connection and what's going on in gitlab, but I just want to make sure it's gonna go you'll start seeing the lines come on gitlab, um so just to recap what we did. um First, we always do get fetch get check out. Your branch make sure you've pulled down any changes from it.

A

Then you got a rebase with master, get rebase dash, dash origin, slash master, you're, gonna, see all your changes and then you're gonna see this file. That was conflict and I can actually scroll up here.

A

um Oh they all disappeared from terminal. Well, because I continue to rewrote but it'll tell you the file, that's conflicted and you will have to go change. It add your changes. Get rebase dash, continue.

A

And if you try to push it- and it says you know, can't do that then you're going to force push it back up to origin that is taking a drastically long time. So that's all I got for you today later.