Thread:Project:Support desk/Help with rebasing./reply (5)

yeah, then solve the conflict, add the changed files with  and run