git stash - Git - How to get latest fix while working on a new feature? -

-

i'm using git , i'm new it. have latest code of project, , i'm working on new feature while i'm working on new feature received email of fix need commited not have yet. unfortunately can't 'get latest version' svn (and merge if needed) new feature file seem blocking pull if new feature file not common fix need get. best way both scenario: 1) have no common files modified new file need, scenario 2) have common file modified (i want quick local merge svn)? w

shall stash, pull fix, , continue work on feature? , pop stash when i'm done?

the original poster asks:

shall stash, pull fix, , continue work on feature? , pop stash when i'm done?

that's 1 option have. other options follows:

the original poster asks:

what best way both scenario:

  1. i have no common files modified new file need?
  2. i have common file modified (i want quick local merge svn)?

if new file have ready commit, can commit it, merge or rebase. if file modified modified in commits you're fetching, doesn't matter if merge or rebase, there's chance might have resolve conflicts either way:

git commit -am "commit message here" git fetch <remote-with-fix>  # rebase work on top of fix git rebase <remote-with-fix>/<branch-with-fix>  # or merge instead git merge <remote-with-fix>/<branch-with-fix>

if new file have not ready commit, make temporary commit, fetch of fix, rebase work on top, undo temporary commit mixed reset:

git commit -am "temporary commit" git fetch <remote-with-fix> git rebase <remote-with-fix>/<branch-with-fix>     git reset head^

Comments

Post a Comment

Popular posts from this blog

css - Which browser returns the correct result for getBoundingClientRect of an SVG element? -

-
this svg contains rect overflows svg element: <svg id='svg' width='10' height='10'> <rect x='-10' y='-10' width='30' height='30'/> </svg> chrome 28 , opera 12 return getboundingclientrect() svg element width , height of 10. firefox 23 reports width , height of 30. correct? jsfiddle the relevant spec cssom , delegates svg spec if svg element not "have associated css layout box". haven't found definition of "having associated css layout box", correct result seem hinge on definition, getbbox returns 30x30 rect in browsers. this firefox bug fixed now, fix in firefox nightlies , should make through firefox 33 released on 14 october 2014. see bug 530985 details.
Read more

gcc - Calling fftR4() in c from assembly -

-
i trying asm fft implementation www.embeddedsignals.com work. running make gives error: undefined reference fftr4(short*, short*, int) at top of asm have .syntax unified .thumb .global fftr4 .type fftr4, %function and there #define's associate c functions arguments registers followed macros fftr4 function uses. after that, fftr4 called .thumb_func fftr4: stmfd sp!, {r4-r11, lr} mov tmp0, #0 // bit reversed counter mov tmp1, #0 .word 0xf3a2fa92 //rbit r3,r2 //rbit r,n lsl r,#3 and c code follows: void fftr4(short *y, short *x, int n); short x[512]; short y[512]; int i; void loop() { (i=0;i<512;i++) x[i]=0; (i=0;i<512;i=i+8) { x[i+0]=16384; x[i+2]=16384; x[i+4]=-16384; x[i+6]=-16384;} fftr4(y, x, 256); serialusb.println(y[128]); serialusb.println(y[129]); serialusb.println(y[384]); serialusb.println(y[385]); // expected results: //y[128]is 8191; y[129] -8190 y[...
Read more

.htaccess - Matching full URL in RewriteCond -

-
i'm trying block post access site (and return 403), except 2 ip's , 1 url ( http://mydomain.com/about-us/contact-us/ ). here's have: rewritecond %{request_method} post rewritecond %{remote_addr} !=1.2.3.4 rewritecond %{remote_addr} !=4.3.2.1 rewritecond %{request_uri} !^http://mydomain.com/about-us/contact-us/$ rewriterule ^ / [f] these rules allowing access ip properly, contact page still not accessible. i'm not sure i'm using request_uri correctly? i've tried variations relative urls rewritecond %{request_uri} !^/about-us/contact-us$ , rewritecond %{request_uri} !^/about-us/contact-us/$ without luck. what doing wrong please? it looks me rule on file name specific. if relax bit, should work. made few other esthetic tweaks. give try: rewritecond %{request_method} post rewritecond %{remote_addr} !^1.2.3.4 rewritecond %{remote_addr} !^4.3.2.1 rewritecond %{request_uri} !about-us/contact-us rewriterule ^ - [f]
Read more