Simon Marlow: > On 09/05/2011 21:04, Roman Leshchinskiy wrote: >> As usual, I'm too stupid >> to understand the git docs. This all *is* quite complicated. > > I am also too stupid to understand the git docs. We should start a club! > What I know about git I've mostly discovered by experimentation, talking to > people on IRC, and reading blog posts.
Now I am glad that I didn't even try to read the git docs! > I haven't tried rebase with sync-all. I only use sync-all for simple tasks, > e.g. to pull I do > > ./sync-all pull --ff-only > > and anything that needs merging I do manually, with either rebase or merge as > appropriate. I'm very tempted to make --ff-only the default. That sounds like a very sane approach to me. Manuel _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
