Git rerere and resolution covering non-conflicting files -


i experienced following situation:

i ran conflict during merge git rerere enabled.

i fixed conflicting file, other non-conflicting files had adjusted, too.
touched files added , committed. git rerere stated has recorded resolution.

a later git pull --rebase=preserve repeated merge conflicts , git rerere came rescue.
however, part of resolution in conflicting files applied, changes in other files not.
quick glance in rr-cache indicates other changes have not been recorded.

is git rerere recording changes in directly conflicting files , nothing else?

is there option record changes done in resolving commit, not conflicting file?

is git rerere recording changes in directly conflicting files , nothing else?

yes. well, almost—it's more complicated.

is there option record changes done in resolving commit, not conflicting file?

no, , "slightly more complicated" part comes in. rerere code doesn't record all changes , resolutions; records conflicting changes , corresponding resolutions. non-conflicting bits not saved @ all.

(note, way, git rebase --preserve re-creates merges, i.e., new git merge commands, think you've observed. invoking git pull has no effect on part of process.)


Comments

Post a Comment

Popular posts from this blog

'hasOwnProperty' in javascript -

i use obj.hasownproperty judge whether object has property, when replaced obj[prop] !== undefined , not normal implementation, ask, why behind method can not use it? object.hasownproperty(prop); object[prop] !== undefined; obj[prop] !== undefined wrong 2 reasons: you can explicitly set property undefined , obj[prop] = undefined; . obj.hasownproperty(prop) return true in case. obj[prop] follow prototype chain, return property that's inherited. obj.hasownproperty(prop) returns true if property exists directly in object, returns false inherited properties.
Read more

python - ValueError: No axis named 1 for object type <class 'pandas.core.series.Series'> -

i´m new programming. i´m trying use scipy minimize, had several issues , gotten through of them. right code, i'm not understanding why i´m getting error. par_opt = so.minimize(fun=fun_obj, x0=par_ini, method='nelder-mead', args=[series_pt_cal, dt, series_caudal_cal]) not enough info given op, somewhere in code it's specified operate data frame column (axis=1) on object pandas series. if code typically works occasional gives errors, check degenerative cases data frame may have 1 row. pandas has nasty habit of guessing want -- may decide reduce 1-row data frame series (e.g., apply() function; can disable using reduce=false in there). add line of code check object isinstance(df, pd.dataframe) or else convert offending pandas series data frame, s.to_frame().t problems had deal with.
Read more

java - How to provide dependency injections in Eclipse RCP 3.x? -

everyone! i'm trying deal eclipse rcp 3.x application. i've read lot of articles dependency injection in rcp e4 applications. can use di in rcp 3.x apps? i found perfect link di in e4. idea how use in rcp 3.x app? first of all, i'm interested in own objects injection (btw, how add own object application context?). best regards in 3.x code can ieclipsecontext necessary use contextinjectionfactory using ieclipsecontext workbenchcontext = platformui.getworkbench().getservice(ieclipsecontext.class); to workbench context. in view or editor can current part context using: ieclipsecontext partcontext = getsite().getservice(ieclipsecontext.class);
Read more