github - Falling into a weird git rebase/pull loop -


i'm trying rebase feature branch git.

i switched master branch with:

git checkout master

got latest version:

git pull

switched back:

git checkout iss248

rebased:

git rebase master

then reason git couldn't fix conflicts automatically, though didn't seem in conflict: went through changes i'd made line line , approved them. thought done, but

git status

said like:

on branch iss248 branch , 'origin/iss248' have diverged, , have 11 , 7 different commits each, respectively.   (use "git pull" merge remote branch yours)  conflicts fixed still merging.   (use "git commit" conclude merge)  changes committed:      modified:   chalktalk/apps/exams/forms.py     modified:   chalktalk/apps/lessons/forms.py

and in files there weird nested conflicts this:

<<<<<<< head <<<<<<< head <<<<<<< head =======         widget=myfilteredselectmultiple('lessons'), >>>>>>> myfilteredselect takes content_name parameter =======         widget=myfilteredselectmultiple('lessons'), >>>>>>> myfilteredselect takes content_name parameter =======         widget=myfilteredselectmultiple('lessons'), >>>>>>> 18bc77f3387fc6ee6cdf7203a92136c8837b0e73

am doing obvious wrong?

after

git rebase master

do need follow somehow make sure local changes reflected on github branch? , why rebase not know how resolve 'conflicts' single line inserted?

thanks!

resolving merge conflict during rebase typically consists of 3 stages:

  1. edit conflicted file(s) select proper portions include , remove extraneous bits including conflict markers
  2. git add files modified, mark them no longer in conflict
  3. git rebase --continue create commit , continue further commits rebased

it appears @ at least 1 point in past, neglected either 2 or 3 (or both).


Comments

Post a Comment

Popular posts from this blog

searchKeyword not working in AngularJS filter -

i writing app using angularjs on front end. want search through table word/field; 1 search box everything. according article here: http://hello-angularjs.appspot.com/searchtable can use filter: searchkeyword this. this code, , not working expected. <label>search: <input ng-model="searchkeyword"></label> <table ng-repeat="post in posts | orderby: sort | filter: searchkeyword"> <tr> <td> {{index(post)}} </td> <td> {{post.title}} </td> <td> {{post.author}} </td> <td> {{post.content}} </td> <td> {{post.date | date: "d/m/yyyy"}} </td> </tr> </table> what should do? thank you try this: controller $scope.posts = [ {title:'title one', author:'author one', content: 'content one'}, {title:'title two', author:'author two', content: 'cont...
Read more

sequelize.js - Sequelize: sort by enum cases -

i have model ( article ) field (the name type ) of type enum('source', 'translated') , return 1 article ordered type field. source articles should returned before translated articles. like: article.findone(order: [ { type: [ 'source', 'translated' ] } ]); unfortunately there appears no built-in solution sorting enums. instead have sort by case , couldn't find documentation on how sequelize. what conventional approach here? sorting case hard in sequelize, sort field (the second answer in linked post) should possible: order: sequelize.fn('field', sequelize.col('type'), 'source', 'translated') it's supported mysql far know though
Read more

user interface - how to replace an ongoing process of image capture from another process call over the same ImageLabel in python's GUI TKinter -

i trying use following code create interactive gui changes color-space(hsv, rbg, grayscale etc) on event of button click. display opencv video in tkinter using multiprocessing being new python having problems multiprocessing , attempts on making gui change it's color space on button clicks hangs entire system. on it's implementation highly appreciated. thankyou. below code: import cv2 pil import image,imagetk import tkinter tk import numpy np multiprocessing import process , queue def quit_it(root,process): root.destroy() process.terminate() def black_andwhite(root,process): process.terminate p=process(target=capture_image, args=(5,queue, )) p.start() root.after(0, func=lambda: update_all(root, image_label, queue)) def update_image(image_label, queue): frame = queue.get() = image.fromarray(frame) b = imagetk.photoimage(image=a) image_label.configure(image=b) image_label._image_cache = b root.update() def update_all(root...
Read more