search

issoseva / issoseva-old

Issoseva.org website
1 stars 0 forks source link

Video embed #25

Closed yogeshkhatri1989 closed 6 years ago

yogeshkhatri1989 commented 6 years ago

Embeds video instead of image if field present

nojvek commented 6 years ago

Any chance you can send a screenshot of how this looks like on your local site?

Also you may need to do git pull origin master --rebase since I have some newer commits.

Thanks.

yogeshkhatri1989 commented 6 years ago

Screenshot with video image

About rebasing by git pull origin master --rebase, it fails with conflicts as master has changes from this branch without the commits (Fix PR feedback commit, etc.). Without rebase its successfully merges master, had already merged master. I think its fine to squash and merge as changes wise there are no conflicts between master and this branch.

Will delete this branch and create a new one when you merge this branch with master.

nojvek commented 6 years ago

you can now just git fetch origin master; git reset --hard origin/master on the yogeshkhatri branch and continue other work there.