According to the docs https://www.conventionalcommits.org/en/v1.0.0/ or to another extendable source if I have a merge conflict what a commit type should I use?
Asked
Active
Viewed 1,417 times
0
-
Merge conflicts shouldn't be committed — they should be resolved and then the fixed files should be committed. – phd Aug 15 '22 at 15:24
-
@phd do you have any tutorial how to do it in best way? – Stepan Aug 15 '22 at 16:47
-
1https://stackoverflow.com/a/163659/7976758 Found in https://stackoverflow.com/search?q=%5Bgit%5D+how+to+resolve+conflicts – phd Aug 15 '22 at 17:11