version control - Commit changes missing from git merge -


i have 2 branches, a) develop , b) feature

i work on b, , ready merge b a. has had lot of work done, lot of other feature branches merging in via pull requests. pull latest head of , testing purposes, let's merge in b (note, same behavior going both directions, i'm trying figure out problem is).

i merged in b, have lot of compiler errors after resolving merge conflicts. noticed there code included in not making on b. causes build fail, , there many things missing (it's @ least 1 large commit's worth of code).

i tracked down commit i'm having issues "merging" b. it's not it's not merging though, see when type "git log" when b checked out after merge. reason actual changes associated commit disappear. there no merge conflicts regarding code in question, , i'm never touched section while working on b else happen.

regarding "missing" commit (even though see in branches log), supposed recover actual changes? use diff tool, i'm worried symptom of larger problem , other code i'm unaware of missing.

i'm new git, i'm little unsure of how approach this. please let me know if there's other information useful.

what i've tried far:

merging in b, commit there code commit not merging b a, same issue same code/commit

i've tried rebasing, branches off many commits many conflicts. commits on server i've read may bad idea. please let me know if should try rebasing in direction (a->b or b->a).

solution

if it's 1 commit that's missing can apply branch issuing cherry-pick command whilst being on b branch:

git cherry-pick commit_name

this command takes specific commit (by name) , applies current branch new commit. check name of commit in log , paste argument.

here more information on command: https://git-scm.com/docs/git-cherry-pick

more on probable cause

as problem itself. there may numerous reasons why experiencing such situation, of may trivial, not. i'd it's probable git sees differences, reason comes conclusion should not applied (during auto-merge process). have check history of b branch, how , when (with regards commit) created , have history specific commit.

anyway, if changes commit not physically present in b code, cherry-pick should solve apply these changes new commit name avoiding problems.


Comments

Post a Comment

Popular posts from this blog

angular - Ionic slides - dynamically add slides before and after -

hi i'm using ngfor create set of 3 slides while starting in middle i'm guaranteed able slide left or right on start. when slide right can simple listen reachedend , push slide array i'm looping. but have problem adding slide beginning. if same above , use e.g. array.unshift() or spread add item beginning, view think it's on position 0 , snaps view new slide. the code below work animates slide change index 1. slide = [0,1,2] //example loop slidechanged(event) { if(this.slides.isbeginning()){ this.slide = [this.slide[0]-1, ...this.slide]; this.slides.update(); this.slides.slideto(1) } } <ion-slides [initialslide]="1" (ionslidedidchange)="slidechanged($event)"> <ion-slide *ngfor="let item of slide"> <h1>slide {{item}}</h1> </ion-slide> </ion-slides> any appreciated! you can using ionslidenextend , ionslideprevend events slides . please
Read more

minify - Minimizing css files -

i want know how css files can minimized. currently, using external sites css minifier compress css files. however, after removing whitespaces, comments, etc, file sizes reduced 10-15%. how frameworks bootstrap manage make minimized versions kilobytes. as example, css is: body { background-color: #ff0; } the reduction goes 28 bytes 22 bytes other css files have lot more characters still smaller this. actually minifying code means it's remove thing code white space characters new line characters comments block delimiters it reduces amount of code has transferred on web , speed site load fastly.but unreadable format.
Read more

Add a dynamic header in angular 2 http provider -

i have http interceptor built via tutorial https://scotch.io/@kashyapmukkamala/using-http-interceptor-with-angular2 the problem need have dynamic header changes automatically once changes 'mode' in app. service able tell interceptor change header, or have interceptor pull header (which string)from service each request. able throwing away patch method, call http.patch('new header string') set header string. call in service controls 'mode' setting. wondering if there way interceptor pull recent value service each request or if can add method http provider via interceptor? i've tried call service in interceptor each request returns undefined. because creating new instance of service or copying value before service fired , loaded/changed data. i don't want pass header string every http provider call because defeats purpose of having interceptor, id able set once changes or have provider fetch service before makes request. tl;dr : need add autom
Read more