Not sure what happened here but it doesn't seem successful: dark-castle:pike79 $ git config branch.7.9.rebase true dark-castle:pike79 $ git status # On branch 7.9 nothing to commit (working directory clean) dark-castle:pike79 $ git pull warning: no common commits remote: Counting objects: 211536, done. remote: Compressing objects: 100% (41175/41175), done. remote: Total 211536 (delta 167690), reused 211330 (delta 167501) Receiving objects: 100% (211536/211536), 36.77 MiB | 1.32 MiB/s, done. Resolving deltas: 100% (167690/167690), done. From pike-git.lysator.liu.se:pike + c70644b...1a6873b 0.5 -> origin/0.5 (forced update) + 0e1ab2d...40f9ab1 0.6 -> origin/0.6 (forced update) [...] + 48df3ba...1b31891 branches/heddas_polypatchar -> origin/branches/heddas_polypatchar (forced update) error: Ref refs/remotes/origin/branches/hubbe is at 06983fde1434ab5470b2fb656c40db32b2e6a971 but expected 108b128dfb32fbdf2a5bc6335266a1676d64e9f9 ! 108b128...5c8e890 branches/hubbe -> origin/branches/hubbe (unable to update local ref) + d9322fc...5891e75 branches/hubbes_image_polygon -> origin/branches/hubbes_image_polygon (forced update) + 4be3c11...a52502a branches/hubbes_working_branch -> origin/branches/hubbes_working_branch (forced update) error: Ref refs/remotes/origin/branches/infovav is at 22c4b59ea865fbb2be49b1656ec7f85040ea65df but expected 4cff4c19627b5a237fc6f50b17f80556821797e7 ! 4cff4c1...68b88f5 branches/infovav -> origin/branches/infovav (unable to update local ref) [...] + b409bde...2fc7962 spider -> origin/spider (forced update) + 94446de...c96524a ulpc -> origin/ulpc (forced update) dark-castle:pike79 $ git status # On branch 7.9 # Your branch and 'origin/7.9' have diverged, # and have 28817 and 28783 different commit(s) each, respectively. # nothing to commit (working directory clean) dark-castle:pike79 $ git --version git version 1.7.3.2
I have no problem wiping that tree and checking it out from scratch again but I'm curious what I should have done differently.
