Hi, On Wed, Feb 11, 2015 at 11:31:40AM -0500, Ed Beroset wrote: > git pull --rebase origin master > (this reported a merge problem with an experimental change I had made to one > of the committed files) > git rebase --skip
And here you were supposed to fix the merge problem instead of skipping the particular patch I think. I usually do not combine commands that way and prefer to do "git fetch origin" (to get me latest upstream code in a remote-tracking branch) and then if I'm on my master branch and I want to rebase it, I do "git rebase origin/master". I think I'm doing it because it's working with any branches, and pull command is specific to dealing with remote servers. > I use svn rather than git daily Git has git-svn transport so one can use git locally and keep interoperability with remote svn repository. This gives numerous advantages as you'll be able to have cheap and predictable branches etc. > and haven't been able to figure out from looking on line how I get > back to just a plain clone, short of blowing away the entire tree > and cloning it again. So what I'd do if I'm on branch "master" currently and I'm ready to have all the local changes I've made to it lost. $ git fetch origin $ git rebase --abort # in case rebase is still in progress $ git reset --hard origin/master # now my current branch becomes identical to origin/master If I had a commit I'd like to keep by rebasing, I'd do $ git rebase origin/master ... fix the merge conflicts ... $ git add <conflicting files> $ git commit --amend $ git rebase --continue > That doesn't seem very reasonable, so what am I doing wrong? Or is > it fine and I just (still) don't understand git at all. I recommend the Git book, it explains the basic underlying concepts nicely, and when you know how it works internally, the logic of the UI becomes way clearer. -- Be free, use free (http://www.gnu.org/philosophy/free-sw.html) software! mailto:fercer...@gmail.com ------------------------------------------------------------------------------ Dive into the World of Parallel Programming. The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ OpenOCD-devel mailing list OpenOCD-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openocd-devel
