Landing Page Animation

[minjlys]

[minjlys]

had difficulties trying to sort out the merge conflict because i didn't update my branch before starting :(
i think i would have to ignore the changes I made in my PR and animate the most recent version of the landing file?

[ALE00111]

had difficulties trying to sort out the merge conflict because i didn't update my branch before starting :( i think i would have to ignore the changes I made in my PR and animate the most recent version of the landing file?

Hi Lydia! Did you end up sorting this out? When you mention ignoring the changes in your PR and animating most recent, did you end up doing this to fix the merge? If you were able to push your changes up to the branch then there shouldn't be any more merge conflicts.

[minjlys]

hey austin! i think i accidentally undid some of the lines from dev in the Landing.tsx file when resolving the merge conflict, so i think a new PR would be ideal? just wanted to get your input first before i did that !

[ALE00111]

hey austin! i think i accidentally undid some of the lines from dev in the Landing.tsx file when resolving the merge conflict, so i think a new PR would be ideal? just wanted to get your input first before i did that !

Oh I see now. Can you try running git pull orgin dev on your current branch. Let me know what it says. If it says divergent branches or something similar, we can think of a fix hopefully.

[minjlys]

this is what i see when running git pull origin dev on my branch for the landing page

[ALE00111]

this is what i see when running git pull origin dev on my branch for the landing page

Oh you're in vim, did you complete the merge? Try hitting esc and doing :wq to complete the merge. I think that's what I usually do to finalize the merging when prompted for the commit message like that. This should complete the merge and you can push that change, if you get merge conflicts you can solve them within the editor on vs code. Let me know if that doesn't makes sense or if it worked.

[minjlys]

i ended up making a new PR - i left comments on it about what issues i ran into

[ALE00111]

i ended up making a new PR - i left comments on it about what issues i ran into

Ah I see ok, that should be fine for now then, but we'll go over some merge conflict stuff to help with addressing these since it can be annoying solving them. I'll close this pr later then.