Mr. Bot Sync PR- How it shows conflicts.

[javascript-tutorial]

Mr. Bot Sync PR- How it shows conflicts.

[iliakan]

For me, the "resolve" button is enabled:

[joaquinelio]

I tried to show you the difference, I failed.
The resolve is only there for the ONE file merged AFTER the PR,
is not working for the 33 ones Mr.Bot found.

You can see it right there,
"Conflicting files"
2-99-2-selection-range
...
One file.

If I resolve it, merge will be enabled again ignoring the rest.

[joaquinelio]

Here.
I resolved OUR little conflict,
MERGE is enabled again

"NO CONFLiCTS" it says.

[joaquinelio]

Merge works, I dangerously pressed it... then cancel.
I put it as draft now.

[joaquinelio]

github somehow treats it as normal text,
I guess merge would add >>>> ==== stuff into the files.
something is missing.

[joaquinelio]

That's it.

Git is right, There are NO conflicts at all

If I MERGE, (dont worry I didnt)

NEW lines will be added, ZERO conflicts.
Those lines are yours and will not overwrite anything,
it will add odd lines

+ "<<<<<<< HEAD"

old spanish untouched text

+ "======
+ "new english text...
+ "new english text...
+ "new english text...
+ "new english text...
+ ">>>>>> branch"

[joaquinelio]

We can still safely use bot's PR,
We just need to pay MUCH attention in edition