version control - Prevent merge on master branch for a type of file - Git -


i have git repo release branch ("master") , other branches develop purposes.

being embedded project, there .tbl files generated or modified on every compilation. need keep tbl files in master branch not modified (unless there new release) , therefore prevent merging other branches modifying tbl files.

i tried declaring tbl files binary or using *.tbl merge=ours specified in https://git-scm.com/docs/git-merge work in case of conflict.

has ever run across similar situation?

git has no merge strategy case.

short of writing own merge strategy—git merge -s arenalor invoke git-merge-arenalor, , you'd have write command whatever you wanted—there is, observed, no way git normal three-way merge on files keep particular version of particular set of files in place.

fundamentally, merge strategies following:

  1. identify merge-base commit. let's call commit b convenience. b has bunch of files saved snapshots; here, other 2 branches diverge.
  2. diff merge base against each branch tip, find files changed in branches. illustration, it's simplest call 2 branch tips l , r, left , right, or local , remote, or ours , theirs (there no l in word "ours" how git works usual recursive , resolve strategies).
  3. build new commit-to-make taking each file b (no change in either branch), l (file changed in our local/left-side branch), r (file changed in remote/right-side branch), or—if file changed in both of 2 branch-tip commits—by combining changes.

the *.tbl merge=ours option in .gitattributes file affects only step 3, , only if file changed in both branch-tip commits. is, merge driver run if git has combine changes. doesn't matter whether changes have conflicts; matters both l , r have changed file f respect in merge base commit b.

these decisions made merge strategy, though, if write own, can make own decisions. note -s ours strategy quite different: instead of doing above 3 steps, 1 step:

  1. take files l. don't need find b, or @ contents of r. keep whatever's in index right , make merge commit parent 1 = l , parent 2 = r.

that want *.tbl files, wrong other files, it's not suitable here.


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

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

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