Back
Similar todos
resolve PR conflicts and merge 
#blog2
resolve 180 merge conflicts ☠️
resolve merge conflicts 
#linefm
merging PR 
#thecompaniesapi
resolve conflicts in controls PR 
#lightbox
resolve conflicts and rebase on master 
#screenhole
merging PR with @yael #thecompaniesapi
merging a big PR 
#mapmelon
resolve a huge merge conflict 
#atd
merge some PRs 
#reactfordataviz
Submit and merge client PRs 
#rockkick
merge 3 PRs 
#instatus
updating 
#djangopackages and merging in a few PRs today
make requested changes to merge the PR
reviewing and merging #djangopackages pull requests
client: merge in updates from develop branch and resolve conflicts
merge conflict resolved