You can use git status at any time to get an overview of your conflicts along with some info on how to mark issues as resolved. VS Code also shows the files which have conflicts in the source control side bar. You are now in the process of MERGING and VS Code shows a merge conflict warning in the terminal: "automatic merge failed: fix conflicts and then commit the result" That will merge the changes from the develop branch into the feature/new-button branch, but because there are conflicts this puts you in the process of MERGING (notice the MERGING text by the branch name in the image below).
So in this example it would be: git checkout feature/new-button The git merge branch-name command tries to merge the branches. The git checkout branch-name switches you to the branch you specify, in fact you can also use git switch in place of git checkout, they do the same thing in newer versions of git. Then you need to run 2 commands like this: git checkout Make sure you have done a git pull on your develop branch to start with so that you have all the latest changes. To resolve the conflicts you start by locally merging the develop branch into your feature branch. Let’s say you’re working on a feature branch called feature/new-button and there’s a conflict with the main branch develop.
Prepare your git branches before you merge Resolve the merge conflicts – file conflicts.Resolve the merge conflicts – code conflicts.Prepare your git branches before you merge.
0 kommentar(er)
