git - Why does rebasing unset my current branch and does not complete? -


i'm on branch b4 , "$ git rebase master", gives me conflicts. 

 $ git rebase master     first, rewinding head replay work on top of it...     applying: rebase: modified 1.txt     using index info reconstruct base tree...     m       1.txt     falling patching base , 3-way merge...     auto-merging 1.txt     conflict (content): merge conflict in 1.txt     failed merge in changes.     patch failed @ 0001 rebase: modified 1.txt     copy of patch failed found in:        c:/hands_on/github/learn_git/cmd/.git/rebase-apply/patch      when have resolved problem, run "git rebase --continue".     if prefer skip patch, run "git rebase --skip" instead.     check out original branch , stop rebasing, run "git rebase --abort".

here, shows i'm no longer on branch b4.

 $ git status     # not on branch.     # rebasing.     #   (fix conflicts , run "git rebase --continue")     #   (use "git rebase --skip" skip patch)     #   (use "git rebase --abort" check out original branch)     #     # unmerged paths:     #   (use "git reset head <file>..." unstage)     #   (use "git add <file>..." mark resolution)     #     #       both modified:      1.txt     #     no changes added commit (use "git add" and/or "git commit -a")

i fixed conflicts , committed changes:

$ vim 1.txt  $ git commit -a -m "fixed rebase conflict" [detached head 2cb2672] fixed rebase conflict  1 file changed, 1 insertion(+)  $ git status # not on branch. # rebasing. #   (all conflicts fixed: run "git rebase --continue") # nothing commit, working directory clean

but when tried "--continue", not complete rebase, instead giving me more "instructions". why?

$ git rebase --continue applying: rebase: modified 1.txt no changes - did forget use 'git add'? if there nothing left stage, chances else introduced same changes; might want skip patch.  when have resolved problem, run "git rebase --continue". if prefer skip patch, run "git rebase --skip" instead. check out original branch , stop rebasing, run "git rebase --abort".

i fixed conflicts , committed changes:

that's went wrong. git rebase --continue expects changes in index, not yet committed. since committed changes, git rebase's own attempt fails, because there no changes left committed.

you should able undo commit action, without resetting index, running git reset --soft @^. , git rebase --continue should work after that.

you alternatively use git rebase --skip bypass git rebase's own attempt commit changes, risks bit more getting messed up: own commit not have respected original commit's author name, email , time.

the fact git status shows you're not on branch not problem. git rebase intentionally detaches current branch until operation finishes. fixed after operations have succeeded.


Comments

Post a Comment

Popular posts from this blog

c# - Validate object ID from GET to POST -

i have method allows user access comment have made on site. have post method lets them update comment. my normal solution send entire comment model through, let them update it, update on database when post back. involve sending commentid through in hiddenfor , can manipulated. how can verify commentid sent in get method same i'm getting in post , not able alter comment wish? how can verify commentid sent in method same i'm getting in post? basically have validate following things in post - user logged-in user. authenticated users post comments. commentid in post , should valid commentid , should present in database. userid associated logged-in user should same userid associated comment . comment should contain userid column, can check @ time of update. to make sure update happens comment has been sent in get - hold commentid in session , in post action compare commentid value in session .
Read more

node.js - Custom Model Validator SailsJS -

when using custom model validator checks record within model. return within spread doesn't seem end control flow. //post.js model /** * custom validator **/ types: { isuservalid: function(user_id) { var promise = require('bluebird'); promise.all([ user.findone({id: user_id}) ]) .spread(function(user) { console.log(user); if (user === null || user === undefined) { console.log('failed'); return false; }else{ console.log('passed'); return true; } }); } }, my response standard validation failed response. { "error": "e_validation", "status": 400, "summary": "1 attribute invalid", "model": "post", "invalidattributes": { "owner": [ { "rule": "isuservalid", ...
Read more

php - Find a regex to take part of Email -

i have following emails need extract part from: bestellnummer xxx: 1 von xxx, 1er pack ------------- anfang der nachricht ------------- foo bar baz foo bar baz // <<<<< need text here ------------- ende der nachricht ------------- ------------- anfang der nachricht ------------- foo bar baz foo bar baz ------------- ende der nachricht ------------- there 0 unlimited occurences of ------------- anfang der nachricht ------------- ------------- ende der nachricht ------------- and i'm able extract first part regex: $re = "/------------- .*? -------------.?(.*?).?------------- .*? -------------/s"; but, i'm quite new on learning regex, i'm pretty sure there must better regex extract part (foo bar baz foo bar baz) of text between ------------- anfang der nachricht ------------- ------------- ende der nachricht ------------- as can in different languages, i'm using .? to match between hyphens. i...
Read more