#1015 NEWTESTEMONIALS

Closed
lucas.lasota wants to merge 23 commits from lucas.lasota/fsfe-website:NEWTESTEMONIALS into master

Hi,

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!

Lucas

Hi, 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! Lucas
max.mehl commented 1 month ago
Owner

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…

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…

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... In order to solve this, you could follow the [recommended workflow](https://wiki.fsfe.org/TechDocs/Git/Workflow#Complex_approach) again and create a new Pull Request. Cleaning this branch will probably be a bit more complex...
Some checks are pending
the build failed
Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Loading…
Cancel
Save
There is no content yet.