Rebase eines Reviews

gistfile1.eclass

c0ldcut:tmp md$ git clone ssh://[email protected]:29418/EDIhub 
Cloning into EDIhub...
remote: Counting objects: 3503, done
remote: Finding sources: 100% (3503/3503)
Receiving objects:  60% (2102/3503), 323.91 KiB | 115 KiB/s     
Receiving objects: 100% (3503/3503), 953.89 KiB | 200 KiB/s, done.
Resolving deltas: 100% (2379/2379), done.


c0ldcut:tmp md$ cd EDIhub


c0ldcut:EDIhub md$ git fetch ssh://[email protected]:29418/EDIhub refs/changes/20/20/4 && git checkout FETCH_HEAD
remote: Counting objects: 215, done
remote: Finding sources: 100% (11/11)
Unpacking objects: 100% (11/11), done.
From ssh://cybernetics.hudora.biz:29418/EDIhub
 * branch            refs/changes/20/20/4 -> FETCH_HEAD
Note: checking out 'FETCH_HEAD'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b new_branch_name

HEAD is now at 30571ef... [LH #386] Anzeige der noch nicht übernommenen Lieferscheine (reviewed, 1st)


c0ldcut:EDIhub md$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: [LH #386] Anzeige der noch nicht übernommenen Lieferscheine (reviewed, 1st)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging controllers/lieferscheine.py
Auto-merging tests/test_controllers.py
CONFLICT (add/add): Merge conflict in tests/test_controllers.py
Failed to merge in the changes.
Patch failed at 0001 [LH #386] Anzeige der noch nicht übernommenen Lieferscheine (reviewed, 1st)

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".



c0ldcut:EDIhub md$ mate Makefile tests/test_controllers.py


c0ldcut:EDIhub md$ git add Makefile tests/test_controllers.py


c0ldcut:EDIhub md$ git rebase --continue
Applying: [LH #386] Anzeige der noch nicht übernommenen Lieferscheine (reviewed, 1st)


c0ldcut:EDIhub md$ make check
...


c0ldcut:EDIhub md$ git push ssh://[email protected]:29418/EDIhub HEAD:refs/for/master         Counting objects: 21, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.78 KiB, done.
Total 11 (delta 9), reused 0 (delta 0)
remote: (W) 2caace2: commit subject >65 characters; use shorter first paragraph
remote: (W) 2caace2: commit message lines >70 characters; manually wrap lines
To ssh://[email protected]:29418/EDIhub
 * [new branch]      HEAD -> refs/for/master