John Mettraux schrieb: > On Wed, Feb 24, 2010 at 4:22 PM, Torsten Schoenebaum > <[email protected]> wrote: >> John Mettraux schrieb: >> >>> nice rewrite of the specs on ruote-kit ! >> Re-read chapter 17.1 of the Rspec book and found the :type option there. >> >>> how did you grab my ruote-kit changes ? >> Did a git rebase before merging to keep the commit history linear and to >> avoid a merge commit entry. >> >>> http://github.com/kennethkalmer/ruote-kit/network >>> >>> I'm trying to merge back your change into my fork, but it results in a >>> conflict. I'm considering nuking my fork and starting again. >> git rebase should help you, too. > > Hello, > > I tried but > > ---8<--- > jmettr...@siamese ~/w/ruote-kit (master) $ git remote add tosch > [email protected]:tosch/ruote-kit.git > jmettr...@siamese ~/w/ruote-kit (master) $ git remote update > Fetching origin > Fetching tosch > remote: Counting objects: 92, done. > remote: Compressing objects: 100% (71/71), done. > remote: Total 71 (delta 47), reused 0 (delta 0) > Unpacking objects: 100% (71/71), done. > From github.com:tosch/ruote-kit > * [new branch] master -> tosch/master > jmettr...@siamese ~/w/ruote-kit (master) $ man git-rebase > jmettr...@siamese ~/w/ruote-kit (master) $ git rebase tosch/master > First, rewinding head to replay your work on top of it... > Applying: moving to ruote 2.1.7 > Applying: set_storage( *args ) instead of set_storage( opts ) > jmettr...@siamese ~/w/ruote-kit (master)↕ $ gitx > jmettr...@siamese ~/w/ruote-kit (master)↕ $ > jmettr...@siamese ~/w/ruote-kit (master)↕ $ > jmettr...@siamese ~/w/ruote-kit (master)↕ $ gu > # On branch master > # Your branch and 'origin/master' have diverged, > # and have 9 and 7 different commit(s) each, respectively. > # > # Untracked files: > # (use "git add <file>..." to include in what will be committed) > # > # .rvmrc > nothing added to commit but untracked files present (use "git add" to track) > jmettr...@siamese ~/w/ruote-kit (master)↕ $ gitx > jmettr...@siamese ~/w/ruote-kit (master)↕ $ git push > To [email protected]:jmettraux/ruote-kit.git > ! [rejected] master -> master (non-fast-forward) > error: failed to push some refs to '[email protected]:jmettraux/ruote-kit.git' > To prevent you from losing history, non-fast-forward updates were rejected > Merge the remote changes before pushing again. See the 'non-fast-forward' > section of 'git push --help' for details. > --->8--- > > I guess I will nuke my fork sooner or later.
Damn it, forgot to mention that rebasing published branches is no good idea. Starting from the scratch will be most easy. Sorry for the inconvenience, Torsten -- you received this message because you are subscribed to the "ruote users" group. to post : send email to [email protected] to unsubscribe : send email to [email protected] more options : http://groups.google.com/group/openwferu-users?hl=en
