Hey Simon, If you have no Haddock changes, try cd'ing into the haddock directory and doing a hard reset to the remote origin (so something like git reset --hard origin/master *INSIDE HADDOCK*), and then changing back to the main directory and git add'ing the directory.
Edward Excerpts from Simon Peyton Jones's message of 2014-04-14 02:13:02 -0700: > Friends > I'm stuck with Git. Help please! > Simon > > I tried to do a 'git stash pop', having just done a 'git pull' from the > master repo. I got this: > > simonpj@cam-05-unx:~/code/HEAD-2$ git stash pop > > warning: Failed to merge submodule utils/haddock (commits don't follow > merge-base) > > Auto-merging utils/haddock > > CONFLICT (submodule): Merge conflict in utils/haddock > > Auto-merging compiler/typecheck/TcRnMonad.lhs > Now git status says > > simonpj@cam-05-unx:~/code/HEAD-2$ git status > > # On branch master > > # Your branch is ahead of 'origin/master' by 2 commits. > > # > > # Changes to be committed: > > # (use "git reset HEAD <file>..." to unstage) > > # > > # modified: compiler/typecheck/TcMType.lhs > > # modified: compiler/typecheck/TcRnMonad.lhs > > # modified: compiler/typecheck/TcSimplify.lhs > > # modified: compiler/typecheck/TcUnify.lhs > > # > > # Unmerged paths: > > # (use "git reset HEAD <file>..." to unstage) > > # (use "git add/rm <file>..." as appropriate to mark resolution) > > # > > # both modified: utils/haddock > The modified files are right. It's the "both modified utils/haddock" that is > messing me up. > I'm not modifying haddock! I just want to say "take the master haddock", but > I don't know how. I tried 'git checkout utils/haddock' but that just led do > `git status' saying > > # modified: utils/haddock (new commits) _______________________________________________ ghc-devs mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-devs
