Side Average meters - Githubissues

rmdmattingly / RowlogAnalysis

MIT License

5 stars 0 forks source link

Side Average meters #27

Closed Logar18 closed 4 years ago

Logar18 commented 4 years ago

@rmdmattingly @taddyb

taddyb commented 4 years ago

@Logar18 You need to fix the merge conflicts with main.py before merging changes

rmdmattingly commented 4 years ago

Something I'd recommend going forward: after successfully PRing and merging a branch into master, just checkout master, pull your changes, and make a new branch for future changes. Having a new branch and new PR for each merge makes review easier and limits merge conflicts