Combining Example-Based and Rule-Based Program Transformations to Resolve Build Conflicts

Sheikh Shadab Towqir, Fei He, Todd Mytkowicz +1

Merge conflicts often arise when developers integrate changes from different software branches. The conflicts can result from overlapping edits in programs (i.e., textual conflicts…