Skip to content
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

In case of Merge Conflicts #126

Open
TechSpiritSS opened this issue Oct 1, 2021 · 6 comments
Open

In case of Merge Conflicts #126

TechSpiritSS opened this issue Oct 1, 2021 · 6 comments
Labels

Comments

@TechSpiritSS
Copy link
Collaborator

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

@Manas1820
Copy link
Contributor

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.

@ron2111
Copy link
Owner

ron2111 commented Oct 1, 2021

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

@TechSpiritSS
Copy link
Collaborator Author

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

@Manas1820
Copy link
Contributor

Manas1820 commented Oct 1, 2021

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

@TechSpiritSS
Copy link
Collaborator Author

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

@Manas1820
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

3 participants