What do you want to save?
Add Code snippet
New code examples
-
Shell/Bash 2021-10-20 10:52:04
git Automatic merge failed; fix conflicts and then commit the result
# Step 1: # Navigate into the local Git repository that has the merge conflict. cd REPOSITORY-NAME # Step 2: # Generate a list of the files affected by the merge conflict. # In this example, the file styleguide.md has a merge conflict. git status ... Add solution -
Other 2021-09-15 14:24:02
how to handle merge conflicts
# Step 1: # Navigate into the local Git repository that has the merge conflict. cd REPOSITORY-NAME # Step 2: # Generate a list of the files affected by the merge conflict. # In this example, the file styleguide.md has a merge conflict. git status ... Add solution