search

ssec-jhu / bluephos

automated computational tool streamlining the development and analysis of blue phosphorescent materials
BSD 3-Clause "New" or "Revised" License
1 stars 1 forks source link

remove fastapi dep to solve #47 #54

Closed xiangchenjhu closed 4 months ago

xiangchenjhu commented 4 months ago

remove unnecessary dependent resolves https://github.com/ssec-jhu/bluephos/pull/47

jamienoss commented 4 months ago

@xiangchenjhu I see that there's an extra three commits to update with main and resolve conflicts, FYI, these shouldn't have been necessary. A good practice for updating your branch with main is to do the following (with conflicts in requirements/prd.txt):

git fetch origin
git rebase origin/main
# resolves conflicts in requirements/prd.txt
git add requirements/prd.txt
git rebase --continue
git push origin del-fastapi-dep
# above should fail
git push origin del-fastapi-dep -f

If not familiar with rebasing, I always advise creating a backup of your branch first using (assuming already on branch)

git branch del-fastapi-dep.bkup
xiangchenjhu commented 4 months ago

Thank you @jamienoss . I just noticed this helpful suggestion. It should be handy for future use.