version control - Git pull requires a merge but no local changes -


i have webhook on github repo triggers git pull on server repository on server in sync what's been pushed github.

sometimes pull requires merge commit server version never committed or altered. when @ diffs, merge commit shows changes last few commits, makes seem server version up-to-date , it's trying pull down behind it.

it runs code pull down branches (which can improved). in case, branch master.

git fetch origin remote in $(git branch -r) ; git checkout $(echo $remote | cut -d \'/\' -f2) && git pull origin $(echo $remote | cut -d \'/\' -f2); done

when run git status on server's version, says local branch xx ahead of remote. these changes coming from?

it sounds may modifying commits have been pushed github. there many ways can happen, 2 common ones amending commits , rebasing. both of these fine local commits, doing shared commits causes trouble.

consider simple repository on github:

a---b---c  [master]

if developer decides amend commit c commit's hash gets changed, instance d. github has commits listed above, developer has locally:

a---b---d  [master]

when developer pushes github push refused, because github contains commit c master branch, commit not present in developer's branch. github accept changes, developer must force push.

any time find force pushing in git you're doing should considered. should occasional action when have to, , not part of "normal" workflow.

now github has been forcefully updated new commit structure includes commit d have exact same problem when try pull updates github: copy of repository on other developers' machines , on server can't cleanly resolve pull because contain commit c, no longer present on github.

we can avoid problem not modifying shared history. instead of amending shared commits, consider adding new commit. history may contain messages like

  • add new feature x
  • oops, fix simple bug in feature x

but that's small price pay not having deal branches have diverged modified shared history.


Comments

Post a Comment

Popular posts from this blog

javascript - RequestAnimationFrame not working when exiting fullscreen switching space on Safari -

request animation frame stops working when exiting fullscreen clicking on original space's safari window. fine if fullscreen mode canceled escape key or calling cancelfullscreen(). steps reproduce: open https://dl.dropboxusercontent.com/u/769042/prezi/safari-fullscreen.html click "draw raf", kittie appears click "fullscreen", go fullscreen click "draw raf", kittie appears go space original safari was, showing "click exit fullscreen mode", click anywhere, out fullscreen click "draw raf", nothing happens what handling click calling: window.requestanimationframe(draw); which draws on canvas context: function draw() { ctx.drawimage(img, math.random()*500|0, math.random()*400|0, 100, 100); } i checked .hidden , .visibilitystate, updated correctly. tested on osx 10.9.3, safari 7.0.4 (9537.76.4). has workaround/solution other switching old settimeout? this sounds webkit bug 88940 : using reque...
Read more

jsf - How to ajax update an item in the footer of a PrimeFaces dataTable? -

this visual of table have: +---------+------------+-------------------+ | header1 | header2 | header3 | +---------+------------+-------------------+ | row | input | calc'ed output | | row b | input b | calc'ed output b | | etc.. | etc.. | etc.. | +---------+------------+-------------------+ | total: total calc'ed output | +------------------------------------------+ and stripped-down code: <p:datatable id="mytable" value="#{mybean.somelist}" var="currentitem"> <p:column headertext="header1"> <h:outputtext value="#{currentitem.name}" /> </p:column> <p:column headertext="header2"> <pe:inputnumber value="#{currentitem.inputval}"> <p:ajax event="change" listener="#{mybean.changelistener}" update="outputval outputtotal...
Read more

django - CSRF verification failed. Request aborted. CSRF cookie not set -

error: reason given failure: csrf cookie not set. in general, can occur when there genuine cross site request forgery, or when django's csrf mechanism has not been used correctly. post forms, need ensure: browser accepting cookies. view function uses requestcontext template, instead of context. in template, there {% csrf_token %} template tag inside each post form targets internal url. if not using csrfviewmiddleware, must use csrf_protect on views use csrf_token template tag, accept post data. you're seeing section of page because have debug = true in django settings file. change false, , initial error message displayed. can customize page using csrf_failure_view setting. did find, nothing helped, must foolish(( my template <form method="post">{% csrf_token %} {% field in form %} <div class="control-group"> {{ field }} </div> {% endfor %} <input type=...
Read more