Hi all, After reading a few articles, converting my old Subversion repositories, merging, branching, fetching, cloning, pushing, pulling, and configuring, I still feel like a Git newbie. For example, I'm trying to make my commit history a little less tangled, so I've cloned our master branch, and then tried to pull my webtag branch on top of that. Now Git tells me that there are conflicts 1) in files I've surely never touched in the webtag branch (for example modules/webbasket/lib/webbasket_dblayer.py), and 2) it's a new branch. How can a new branch conflict with something that doesn't exist yet? Is there some way in which Git does not understand which commits are "mine", and which are in the master? Is there some way to replay only *my* commits from a remote branch on the local tree, to create a sane branch?
Also, it seems that any attempt to rebase to master results in a horrible mess of octopus commits, even though I only ever commit stuff linearly. Is there some magic to tell Git try really hard to create a linear sequence out of my commits? git rebase -i doesn't seem to work (I usually get messages saying it *somehow* can't continue) unless I try to squash everything into a single commit. And that's not what version control is about :) -- Victor Engmark
