Skip to content

/ es.javascript.info

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

Jump to bottom

Mr. Bot Sync PR- How it shows conflicts. #387

Open
joaquinelio opened this issue Sep 22, 2020 · 7 comments
Open

Mr. Bot Sync PR- How it shows conflicts. #387

joaquinelio opened this issue Sep 22, 2020 · 7 comments

Comments

@joaquinelio
Copy link
Contributor

@joaquinelio joaquinelio commented Sep 22, 2020 •
edited

@iliakan
There are many conflicts in those files, #383
but the only one GIT treats as a conflict is the one recently added in the last ES merge,
the only one that disabled the merge button.

This branch has conflicts that must be resolved
Use the web editor or the to resolve conflicts.
Conflicting files
2-ui/99-ui-misc/02-selection-range/article.md

It would be nice to have the GITHUB conflicts tools for easy fixing all the conflicts,
but more important, without them you may miss changes and...
accidentally merge the files with >>> === <<< stuff ?

Can this be improved?
Just to know and spread the warning
@vplentinax @EzequielCaste @maksumi @lizzie136
@iliakan
Copy link
Member

@iliakan iliakan commented Sep 23, 2020 •
edited

For me, the "resolve" button is enabled:
image
@joaquinelio
Copy link
Contributor Author

@joaquinelio joaquinelio commented Sep 23, 2020 •
edited

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
Copy link
Contributor Author

@joaquinelio joaquinelio commented Sep 23, 2020 •
edited

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

image

"NO CONFLiCTS" it says.
@joaquinelio
Copy link
Contributor Author

@joaquinelio joaquinelio commented Sep 23, 2020

Merge works, I dangerously pressed it... then cancel.
I put it as draft now.
@joaquinelio
Copy link
Contributor Author

@joaquinelio joaquinelio commented Sep 23, 2020 •
edited

github somehow treats it as normal text,
I guess merge would add >>>> ==== stuff into the files.
something is missing.
@joaquinelio
Copy link
Contributor Author

@joaquinelio joaquinelio commented Sep 23, 2020 •
edited

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
Copy link
Contributor Author

@joaquinelio joaquinelio commented Sep 23, 2020

We can still safely use bot's PR,
We just need to pay MUCH attention in edition
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
2 participants
@iliakan @joaquinelio
You can’t perform that action at this time.