I am adding the interview’s page for the Testimonial section of our website. If everything is fine with the code, olease merge the following features:
. Eight interview’s pages (Gkotsopoulou, Grun, Lequertier, Mueller, Ockers, Snow, Weitzhofer and Zerolo)
. Eight modules for dynamic content (Gkotsopoulou, Grun, Lequertier, Mueller, Ockers, Snow, Weitzhofer and Zerolo)
Thank you very much!
I assume this is supposed to be reviewed by @eal?
Regarding the conflict, that’s probably because you haven’t run a git pull upstream master while being on the master branch before starting the new branch NEWTESTEMONIALS with git checkout -b NEWTESTEMONIALS. This is why in the commit display of this pull request, there are still a lot of old (conflicting) commits…
git pull upstream master
git checkout -b NEWTESTEMONIALS
In order to solve this, you could follow the recommended workflow again and create a new Pull Request. Cleaning this branch will probably be a bit more complex…
No due date set.
This pull request currently doesn't have any dependencies.
Deleting a branch is permanent. It CANNOT be undone. Continue?