Awesome-Projects-Collection icon indicating copy to clipboard operation
Awesome-Projects-Collection copied to clipboard

Published 20 hours ago • verified publisher icon ron2111

In case of Merge Conflicts

Open TechSpiritSS opened this issue 4 years ago • 6 comments

Before making any Pull Request always fetch your repo to the latest and after that send the Pull Request to avoid any conflicts. Do not edit the Readme file. Add your project info in project_doc.md after fetching the GitHub Repo

image

TechSpiritSS avatar Oct 01 '21 09:10 TechSpiritSS

I guess it won't work if you end up sending a pr but another pr was merged after you send a pr then the conflicts will persist.

Manas1820 avatar Oct 01 '21 09:10 Manas1820

Yes, but it is important to update the project_doc , so the contributors should raise the PR again after fetching upstream @Manas1820

ron2111 avatar Oct 01 '21 09:10 ron2111

None is fetching their Repo which is causing the problems with Pull Requests

TechSpiritSS avatar Oct 01 '21 09:10 TechSpiritSS

In case of conflicts in the Readme for contributors list @ron2111 can add this - https://github.com/marketplace/actions/auto-add-contributors

Manas1820 avatar Oct 01 '21 09:10 Manas1820

that's great, @ron2111 we can use this to make readme file task easier

TechSpiritSS avatar Oct 01 '21 09:10 TechSpiritSS

I have used it and seen it used many times and the UI generated is cool too

Manas1820 avatar Oct 01 '21 09:10 Manas1820