[QUICK ISSUE] Having git conflict issues - Githubissues

nss-day-cohort-46 / How-to-Ask-for-Help

0 stars 0 forks source link

[QUICK ISSUE] Having git conflict issues #184

Closed Thomas88s closed 3 years ago

Thomas88s commented 3 years ago

Name:Thomas

Breakout Room:Thomas

REQUIRED Question or issue:

would like help merging have conflicts and would like some help was able to merge in git with no issues but when i tried to pull main it created conflicts

REQUIRED Check all that apply:

[ x] Rubber Ducking
[ x] Direction/Guidance
[ ] Check In (Pep talk, vent session, etc.)

Code Snippet

Auto-merging src/components/records/RecordForm.js
CONFLICT (content): Merge conflict in src/components/records/RecordForm.js
Automatic merge failed; fix conflicts and then commit the result.

Thomas88s commented 3 years ago

I had some commits on main that weren't intentional. Was able to pull my correct main down from git and now merging with no conflicts is possible.