Resolve merge conflicts
Resolve conflicts with GitHub
Click on the “Resolve conflict” button → find out the conflict areas and remove metadata and conflict portion of a specific branch (like master or feature branch) → click “Commit merge”
Resolve merge conflicts with the Command line
Open a terminal with the current git repository …
1st step
git fetch origin
git checkout -b scriptBranch origin/scriptBranch
git merge remotes/origin/main
2nd step
git add <file name> or git add .
git commit -m “commit message”
3rd step
git checkout main
git merge --no-ff scriptBranch
git push origin main
Post a Comment