Author Topic: Small Git-Question about pull-requests  (Read 6137 times)

Offline Xilmi

  • Moderator
  • Commander
  • ***
  • Posts: 605
    • View Profile
Re: Small Git-Question about pull-requests
« Reply #30 on: February 12, 2023, 01:05:44 am »
It's not as bad as it looks.

I've been doing OXC -> OXCE and OXCE -> OXCE+ merges for years, you get used to it :)
And it's a good way to learn.
Yeah, it was only like 6 things where I actually had to put some thought in. I don't know why the other stuff couldn't merge automatically. Probably somehow my fault.

Offline R1dO

  • Colonel
  • ****
  • Posts: 437
    • View Profile
Re: Small Git-Question about pull-requests
« Reply #31 on: February 12, 2023, 10:26:20 am »
From my experience.

Automatic merges usually fail if there are changes on the same line for both sides.
Since the algorithm does not know what the truth should be a conflict is the safest approach.