C#•3y ago

✅ How to Fix Merge Conflicts? Beginner - Confused

I have no idea what I've done. I tried to revert a commit through GitHub Desktop and now this has happened.

AdiZOP•11/23/23, 12:11 AM

This is CipherDecoderApp.unityCipherDecoderApp.unity

message.txt49.19KB

AdiZOP•11/23/23, 12:11 AM

If someone could help me figure this out that would be great.

Jimmacle•11/23/23, 12:12 AM

merge conflicts look like this

<<<<<<< HEAD
=======
  - {fileID: 2048073632}
>>>>>>> parent of 9f3889c (CRASHING - Changed TMP Input Field Objects)

<<<<<<< HEAD
=======
  - {fileID: 2048073632}
>>>>>>> parent of 9f3889c (CRASHING - Changed TMP Input Field Objects)

AdiZOP•11/23/23, 12:12 AM

Okay I've found it.

Jimmacle•11/23/23, 12:13 AM

git is saying that it doesn't know how to combine the changes so it just includes both versions and tells you to fix it yourself

JJimmacle git is saying that it doesn't know how to combine the changes so it just include...

AdiZOP•11/23/23, 12:13 AM

How kind of it

.When I click on Compare ChangesCompare Changes it just shows me this and I can't make any sense of this without visual representation.

Jimmacle•11/23/23, 12:14 AM

the part above the ============== line is the version at your HEAD commit and the part below is the version from the specified commit

Jimmacle•11/23/23, 12:15 AM

so you have to pick out which bits of code you want, then replace the whole conflict section with that and commit it like you normally would

Jimmacle•11/23/23, 12:15 AM

it just so happens that there's nothing in the HEAD version of this one

AdiZOP•11/23/23, 12:15 AM

But does that mean that nothing is being changed?

AdiZOP•11/23/23, 12:16 AM

How can a commit even have nothing in it?

Jimmacle•11/23/23, 12:16 AM

that's not a commit, that's a merge conflict

AdiZOP•11/23/23, 12:16 AM

Ohh right

Jimmacle•11/23/23, 12:16 AM

so this one is easy, assuming you want that fileID line just replace that whole section with

  - {fileID: 2048073632}

  - {fileID: 2048073632}

AdiZOP•11/23/23, 12:17 AM

So replace these 4 lines with that fileID?

mtreit•11/23/23, 12:17 AM

VS Code has a nice UI for helping with merge conflicts.

AAdiZ How kind of it 😂 .When I click on `Compare Changes` it just shows me this and I...

AdiZOP•11/23/23, 12:17 AM

Where can I find that? This is all I could find

mtreit•11/23/23, 12:18 AM

Like you should see something that says "Accept Incoming Change" or "Accept Current Change" that you can click above the conflict.

AdiZOP•11/23/23, 12:18 AM

Yep I see that

AdiZOP•11/23/23, 12:18 AM

Oh right of course that means I don't have to do anything manually

AdiZOP•11/23/23, 12:19 AM

Thank you both!

✅ How to Fix Merge Conflicts? Beginner - Confused

Similar Threads

Similar Threads

Similar Threads