Ruby on Rails problem 3.2 - It shows in HTML Git commands

Asked

Viewed 52 times

1

When I push to 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 is in trouble.

Ruby 1.8.2 Rails 3.2 Jenkins Gitlab

Screenshot of the problemScreenshot do problema

ruby-on-rails git
  • 2

    This is why you did it merge, rebase or some other operation for your current branch and didn’t resolve the conflicts, when git can’t do the whole process on its own adds these markups to facilitate conflict resolution. Just you resolve the conflicts and that’s it!

  • @Brunswick put your comment as a response :)

1 answer

1

This is why you did it merge, rebase or some other operation for your current branch and did not resolve conflicts before commit --> push.

When git can’t do the whole process on its own adds these markups (see Basic Merge Conflicts) to facilitate conflict resolution.

The solution, then, is to resolve these conflicts(how to resolve Conflicts) and once resolved, send to the remote.

  • The problem is that the error is only appearing on the server, local is working. How could fix this on the server, since I am grateful.

  • @Rodolfopeixoto the Jenkins clones from which branch? Make a "zero" clone of it branch and see how the code looks on it. You will no longer be able to use merge, for it has already been done commit and push, ie, git has already been told that there is no conflict. So clone branch and see the files that are in trouble, ok?

  • Jenkins is cloning master, I went to check the gitlab only has master, I went to where the heads errors and so forth appeared, I edited, but he did not clone properly to the server. Could it be error on the server or Jenkins? I did it from scratch like I said, but on the server only the commit hash appears. : X Thank you so much for your patience

  • @Rodolfopeixoto guy, kind of hard where is GENERATING the error, what I can tell you is what is in the same answer, ie that no conflicts have been solved at some point. Check the job from Jenkins, see how he is executed. What there was to test is to make the same clone that Jenkins does and test locally, so you can validate what is wrong, whether the location of Jenkins or whether remote, understood?

  • I understood yes, I will do the check now, thank you very much for your help!

Browser other questions tagged ruby-on-rails git

You are not signed in. Login or sign up in order to post.