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

Update CONTRIBUTING.md #202

Merged
merged 2 commits into from
Jan 20, 2024
Merged

Update CONTRIBUTING.md #202

merged 2 commits into from
Jan 20, 2024

Conversation

bestorw01
Copy link
Contributor

Added the Documentation messaged

Added the Documentation messaged
Copy link
Contributor

@petya-kangalova petya-kangalova left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. @omranlm we need to check the order once we merge all.

CONTRIBUTING.md Outdated Show resolved Hide resolved
@omranlm
Copy link
Contributor

omranlm commented Jan 16, 2024

the PR is giving conflict because contributors worked on the same file simultaneously
@petya-kangalova @kshitijrajsharma

@kshitijrajsharma
Copy link
Member

kshitijrajsharma commented Jan 20, 2024

I fixed your conflicts , Also added relative paths on your links

In order to do it by yourself in future days :

You might need to perform following :

  • git merge origin/master
  • git pull --rebase
  • Fix your conflicts
  • git push

or
You can use Github UI here directly

@kshitijrajsharma kshitijrajsharma merged commit 49fe84c into hotosm:master Jan 20, 2024
2 checks passed
jeafreezy pushed a commit to jeafreezy/fAIr that referenced this pull request Sep 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants