-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Message Bus Engine v1 #60
Conversation
I am scared to resolve those conflicts because of what happened last time. |
@miketwo How would I go about resolving the merge conflicts? Last time I had to create a sort of combination between the 2. That apparently messed up a lot of stuff as you saw when I tried to update the message bus branch with commits from main. |
Yeah merge conflicts suck, hah. I'll show you how I would do it. In this case, you have only 1 commit on So from the That makes the conflicts appear in VSCode. You can edit the files to resolve the conflicts -- the "broken" files will be red. Here's a gif showing a bit of what that looks like: Once it's all cleaned up (and tests pass!), you do 2 commands:
Now you can update GitHub's copy of the branch by force pushing: (Heads up that you almost never want to force push. One person force pushing breaks all other people's If you wanted to do it the more traditional way, it's almost the same. You do:
|
Also heads up that you want to find and remove |
And, generally-speaking, you probably want to accept the "INCOMING" changes, as those will correspond to your current branch. (It's weird and backwards-sounding). |
I think I get it but I don't understand the |
Let me know if you need help and I can resolve the conflicts for you. (Adding a message bus is hard enough without having to fight with git.) |
Got it! |
GitHub doesn't think so, I guess. |
I did the push command but git hub shows that its even more offset from main than before. Edit: And now when I do |
Your local main is not up to date. That's why it's good to specify the Github's main ("origin"):
On your main branch, you need to git pull. And now you've got a whole boatload of repeated commits to fix. Let me see if I can help... |
I did |
Hmm... That's strange. Ok. So where is the commit where you fixed all the conflicts? (Did you go through the broken files fixing them?) There's no way around that part of it. |
Ok. I pushed a branch ( |
It should show as that group of 17 commits above. I did go through the rebasing for each of them. |
Ok, I'm going to delete this one and make a new draft from the fixed branch. Thank you! |
No description provided.