version control - git fetch changes from a local branch -

-

i have git problem local branch , don't know how solve it. after reading topics on stack overflow thought found solution git produces error don't understand.

i have master branch few commits behind development branch. since want make bugfix on master, made feature branch , want these changes development branch. thought switch development branch , fetch new featurebranch getting message featurebranch no repository...

$ git fetch clusters fatal: 'clusters' not appear git repository fatal: not read remote repository.  please make sure have correct access rights , repository exists. $ git branch   clusters * develop   master   plotlydev   protrna_plot   release010

so how changes within featurebranch development branch?

fetch retrieves changes remote. you're thinking of merge

git checkout develop git merge feature

Comments

Post a Comment

Popular posts from this blog

sql - invalid in the select list because it is not contained in either an aggregate function -

-
i can't figure out rewrite sql statement avoid error below msg 8120, level 16, state 1, line 26 column 'staffmember.staffmemberid' invalid in select list because not contained in either aggregate function or group clause. sql statment select (select [dbo].[udf_readstaffmemberbasic](sm.staffmemberid) xml path ('staffmembersummary'), root ('items'), type ), count(sm.staffmemberid) totalresults, ceiling(cast(count(sm.staffmemberid) decimal)/ @pagesize) totalpages staffmember sm inner join staffmembertoadditionalrole ar on sm.staffmemberid = ar.staffmemberid (sm.firstname '%' + @name + '%' or sm.surname '%' + @name + '%') , (@floorid null or sm.floorid = @floorid) , (@directorateid null or sm.directorateid = @directorateid) , (@additionalroleid null or ar.additionalroleid = @additionalroleid) order sm.staffmemberid offset @page * @pagesize rows fe...
Read more

Angularjs unit testing - ng-disabled not working when adding text to textarea -

-
i trying test angularjs component using karma, mocha, power-assert. have textarea , button in component, button disabled based on length of text in textarea. when run component in browser works perfectly. can't figure out how test functionality. here's bit of code. inquiryform.js function inquiryform($scope) { // plan add logic here } angular.module('myapp').component('inquiryform', { controller: inquiryform, controlleras: 'inquiryform', templateurl: 'inquiryform.html' }); inquiryform.html <div class="contact"> <div>thanks contacting us.</div> <form> <textarea ng-model="inquiryform.inquirytext" name=""></textarea> <input type="submit" value="send" ng-disabled="!inquiryform.inquirytext.length"> </form> </div> inquiryformtest.js describe('inquiry form ', () => { let $r...
Read more

python - Error opening file in H5PY (File signature not found) -

-
i've been using following bit of code open hdf5 files, produced in matlab, in python using h5py: import h5py h5 data='dataset.mat' f=h5.file(data, 'r') however i'm getting following error: oserror: unable open file (file signature not found) i've checked files i'm trying open version 7.3 mat-files , hdf5 format. in fact i've used h5py open same files before. i've confirmed files exist , accessible i'm not sure error coming from. advice appreciated, in advance : ) usually message file signature not found indicates either: 1. file corrupted. ... think likely. said you've opened files before. maybe forgot closing file-handle can corrupt file. try checking file hdf5 utility h5debug (available on command line if you've installed hdf5 lib on os, check dpkg -s libhdf5-dev on linux). 2. file not in hdf5 format. this known cause error message. since said made sure, case , you've opened files before, i...
Read more