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.

Sign up for GitHub

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

Contributing: Add Docs to resolve Merge Conflicts #157

Merged
merged 1 commit into from
May 29, 2024
Merged

Contributing: Add Docs to resolve Merge Conflicts #157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,15 @@ in case you are stuck:

<br>

## **Resolving Merge Conflicts**

1. First, ensure that the upstream remote is set. If it’s not set yet, add it by running the following command: `git remote add upstream https://github.com/algovengers/Hairify`
2. Do `git fetch upstream` on your main branch
3. Checkout your working branch and rebase it from upstream/main by using the command: `git rebase upstream/main`
4. Resolve Merge conflicts in your editor.
5. Do `git rebase --continue` after resolving all merge conflicts
6. Force push to your branch by using this command `git push origin <your-branch> --force`

<br>

# **Thank you for contributing💗**