fixing-git-conflicts-without-merging.md

Fixing git conflicts without merging

1. Make sure your master branch is in the last version

git checkout master
git pull

2. Go to the branch with conflicts

git checkout feature/my-branch

3. Solve conflicts locally

git rebase origin/master

4. Commit changes

git add .
git commit -m "chore(*): fix merge conflicts"

5. Push the solved info to repository

git push -f origin HEAD:feature/my-branch