Back
Similar todos
rebase & resolve conflicts
resolve merge conflicts 
#linefm
resolve PR conflicts and merge 
#blog2
resolve conflicts & merge PR 🎉 
#screenhole
merge dev → master 
#thundercontent
client: merge in updates from develop branch and resolve conflicts
resolve a huge merge conflict 
#atd