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

Popular posts from this blog

'hasOwnProperty' in javascript -

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

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