Questions tagged as 'conflictos'

I tried to do a git cherry-pick , but it failed with a conflict: $ git cherry-pick master error: could not apply 456190d... Mejoro el post hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' o...

I can not get the following code to work properly for me if you did not comment on the line link ">. What I'm doing is a test that I must include in an application that is already using boostrap and this version of jquery. I want to i...