Note that there are some explanatory texts on larger screens.

plurals
  1. POFalse Dependency in Gerrit after a git pull
    primarykey
    data
    text
    <p>I did the following in Git, and now have a false dependency issue.</p> <ol> <li>Created a new branch, using <code>git checkout -b fixPlayer</code></li> <li>I made some changes to the code, and created some new files too, then staged for commit using <code>git add -A</code></li> <li>I then committed the changes via <code>git commit</code></li> <li>I then created a new branch a couple days later, using <code>git checkout -b fixLaserAim</code></li> <li>(<strong>Where the chaos started, I think</strong>). I thought that my local working copy of "master" might be out of date, so while in this branch, I ran <code>git pull</code>. I think this caused some sort of merge issue. So I switch back to master, update it (<code>git checkout master</code>, <code>git pull</code>), then switch back to my second branch, <code>git checkout -b fixLaserAim</code>.</li> <li>I finish my changes for fixLaserAim, stage for commit, <code>git add -A</code>, and commit it <code>git commit</code>.</li> <li>Finally, I switch to my earlier branch, "fixPlayer", and push it, <code>git push origin HEAD:refs/for/master</code>, and then switch over to my "fixLaserAim" branch, and do the same thing.</li> </ol> <p>Both of these changes appear in Gerrit, but for some reason, "fixLaserAim" notes that it is dependent on "fixPlayer". The two do not touch any of the same files, and I'm trying to find out how to remove this dependency in Gerrit, because it is blocking automated builds and the change eventually going into production.</p> <p>How can I fix this issue?</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload