What is the best way to sync jumpstarter repo with current app.

Each day, merging new stuff becomes harder and harder. Even rr could not help, so need to fix the same conflicts, especially in gemfile. 

Also, some files which cause some issues are still restored, even you recorded to delete them.

What approach do you use? Do you prefer cherry picks over merge? or someone rebases?