gitgithubpentaho

Git Not In Sync with Local Branch

I am not sure what is wrong. I have a basic understanding of git, but I am not an expert.

In my remote branch, I have a file that has a bunch of changes, etc in it. In my local branch, this file is completely empty.

When I open up github, and the file, I notice it has something like this, so I believe something is out of sync:

<<<<<<< HEAD:my_repo/category_1/run_daily_jobs/summary_daily_job.kjb
      <xloc>1328</xloc>
      <yloc>80</yloc>
=======
      <xloc>1280</xloc>
      <yloc>128</yloc>
>>>>>>> 44abcxyzbunchofvalues:my_repo/summary_daily_job.kjb

Based on the comments, here is what I have done:

  1. Went to github
  2. Found the file
  3. Googled "how to read a merge conflict in github" and edited the file appropriately.
  4. Ran "git pull origin/my_branch"

When I ran this command here is what the message said:

From my_repository
* branch   my_branch   -> FETCH_HEAD
updating some value
Fast-forward
.../name_of_file.kjb | 367 --------------------
1 file changed, 367 deletions(-)
  1. For some reason, the file is still blank though when I open it in the software I am using (Pentaho). Maybe this is a software issue at this point though?

Here is how I edited my file, compared to what I have above:

  <xloc>1328</xloc>
  <yloc>80</yloc>
Solution

  • If one of the guys in the comments posts an answer within 72 hours, I will mark their answer as the solution and not mine since their comments helped me solve this.

    What is going on is called a Merge Conflict.

    It occurs when I make changes to one branch, switch to another branch and make changes, and then try to merge branches.

    The way you solve this is by going into Github, editing the sections that contain <<<<<<<<<<<< and >>>>>>>>> and removing either the line above or below the ======= line. You also want to obviously remove the <<<<<< and >>>>>>>> lines.

    If you go to open up your file in and it looks blank or get an error message, you made a mistake when editing the file to get rid of the Merge conflicts.

    Then type git pull origin your_branch to get the most recent changes from Github.

    Finally type git push origin your_branch to finally update Github.

    Merge conflict is now resolved.