Auto-merging Databaes/main_app/templates/pets/detail.html
CONFLICT (content): Merge conflict in Databaes/main_app/templates/pets/detail.html
Automatic merge failed; fix conflicts and then commit the result.
What is the problem you are trying to solve?
Ryan and I tried all the steps
Expected behavior
trying to merge with the main stream
What is the actual behavior?
Auto-merging Databaes/main_app/templates/pets/detail.html
CONFLICT (content): Merge conflict in Databaes/main_app/templates/pets/detail.html
Automatic merge failed; fix conflicts and then commit the result.
Post any code you think might be relevant (one fenced block per file)
`
**What is your best guess as to the source of the problem?**
**What things have you already tried to solve the problem?**
**Additional context**
Add any other context about the problem here.
**Paste a link to your repository here**
Tessabaxter12
commented
9 months ago
Describe the bug
Auto-merging Databaes/main_app/templates/pets/detail.html CONFLICT (content): Merge conflict in Databaes/main_app/templates/pets/detail.html Automatic merge failed; fix conflicts and then commit the result.
What is the problem you are trying to solve? Ryan and I tried all the steps
Expected behavior trying to merge with the main stream
What is the actual behavior?
Auto-merging Databaes/main_app/templates/pets/detail.html CONFLICT (content): Merge conflict in Databaes/main_app/templates/pets/detail.html Automatic merge failed; fix conflicts and then commit the result.
Post any code you think might be relevant (one fenced block per file) `