When I push the server (I'm using jenkis and gitlab) when I check the address it shows several errors. www.scti.uenf.br this is the site that has a problem.
Ruby 1.8.2
Rails 3.2
Jenkins
Gitlab
Problem Screenshot 
This is why you made merge , rebase or some other operation for your current branch and did not resolve the conflicts before doing commit - > push .
When git can not do the whole process itself, it adds these tags (see Basic Merge Conflicts ) to facilitate conflict resolution.
The solution is then to resolve these conflicts ( how to resolve conflicts ) and then resolved, send to remote .
