search

MLH-Fellowship / Social-BERTerfly

Finding your MBTI personality type based on your Twitter activity using BERT
MIT License
92 stars 32 forks source link

Merge frontend with the main branch #12

Closed V2dha closed 3 years ago

V2dha commented 3 years ago

@susiejojo kindly see all the latest changes are there.

susiejojo commented 3 years ago

There are a couple of merge conflicts, I'm not sure of the content of the frontend branch, so I don't think I should merge.

sh-biswas commented 3 years ago

There are a couple of merge conflicts, I'm not sure of the content of the frontend branch, so I don't think I should merge.

Not sure why this is happening? On my end, it says there are no conflicts.

V2dha commented 3 years ago

Yeah with me too there are no conflicts with the main branch. One thing is that there is a models folder in the current branch with the model weights which should be in the gitignore but I don't think that should cause merge conflicts. @susiejojo what kind of merge conflicts is it showing?

susiejojo commented 3 years ago

Fine, it was some problem with VSCode on my part. I'm merging with main.