- On main I first did:
git pull origin main
- Added your fork as a remote:
git remote add dipika https://github.com/dipikabh/content.git
- Fetched the branch:
git fetch dipika move-contrib-docs:move-contrib-docs
- Switched to the branch:
git switch move-contrib-docs
- Merged main onto your branch:
git merge main
- Removed all the files that was causing conflicts:
rm files/en-us/mdn/guidelines/code_guidelines/css/index.md files/en-us/mdn/guidelines/code_guidelines/general/index.md
files/en-us/mdn/guidelines/code_guidelines/javascript/index.md files/en-us/mdn/guidelines/code_guidelines/shell/index.md
files/en-us/mdn/guidelines/writing_style_guide/index.md files/en-us/related/criteria_for_inclusion/index.md files/en-us/related/project_guidelines/index.md
- Add changes:
git add .
- Committed the changes:
git commit -m 'remove moved files from origin location'
- Pushed the changes to your branch:
git push dipika move-contrib-doc
