CODEWITHSUNDEEP
gitgerrit
Cloud
Cloud

Reputation: 19333

False Dependency in Gerrit after a git pull

I did the following in Git, and now have a false dependency issue.

  1. Created a new branch, using git checkout -b fixPlayer
  2. I made some changes to the code, and created some new files too, then staged for commit using git add -A
  3. I then committed the changes via git commit
  4. I then created a new branch a couple days later, using git checkout -b fixLaserAim
  5. (Where the chaos started, I think). I thought that my local working copy of "master" might be out of date, so while in this branch, I ran git pull. I think this caused some sort of merge issue. So I switch back to master, update it (git checkout master, git pull), then switch back to my second branch, git checkout -b fixLaserAim.
  6. I finish my changes for fixLaserAim, stage for commit, git add -A, and commit it git commit.
  7. Finally, I switch to my earlier branch, "fixPlayer", and push it, git push origin HEAD:refs/for/master, and then switch over to my "fixLaserAim" branch, and do the same thing.

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.

How can I fix this issue?

Upvotes: 2

Views: 239

Answers (1)

Cloud
Cloud

Reputation: 19333

In the end, it was a server side bug in Git itself. Resolved.

Upvotes: 1

Related Questions