Skip to content

backtracking repeats unrelated autofills #202

@jrosenberger

Description

@jrosenberger

I'm working on a relatively big merge (~1900 x ~125 commits). It's been going smoothly, but I just finished a big block, and the ensuing autofills are taking forever. I noticed that it filled row 21 from column 531 to column 1005 ie 531-21 to 1006.21. Then it hit an unexpected conflict at 1007-5, and proceeded to auto fill 531-21 to 1005-21. Then it hit another conflict at 1006-5, and is autofilling 531-21 and on again.

I'm worried it's going to do these same 500 commits of work 6 times all the way up to 1006-1. Is there a reason I'm missing that this work isn't actually the same? Nothing that's a parent of any of it seems to have been changed.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions