I want to push files to git even when there is a merge conflict (in this case I want to push the conflict). I don´t find the way. Git doesn't allow me to commit due to the conflict, but I want to push this conflict.
How can I do it?
Asked
Active
Viewed 47 times
1 Answers
1
Use git add to mark the file as resolved, and then git commit to complete the merge.
simon-pearson
- 1,601
- 8
- 10
-
You are right, I didn't find the way but it was too easy, thanks a lot @Simon-pearson. – David Marciel Mar 30 '20 at 17:09