FSFE
/
fsfe-website
29
30
Fork 85
Code Issues 62 Pull Requests 14 Wiki Activity

NEWTESTEMONIALS #1015

Closed
lucas.lasota wants to merge 23 commits from lucas.lasota:NEWTESTEMONIALS into master
pull from: lucas.lasota:NEWTESTEMONIALS
merge into: FSFE:master
Conversation 1 Commits 23 Files Changed 17 +953 -7
lucas.lasota commented 2019-07-10 14:39:53 +00:00
Member
Copy Link

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 2019-07-10 15:11:19 +00:00
Owner
Copy Link

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...
max.mehl closed this pull request 2019-07-18 12:41:36 +00:00
Some checks are pending
the build failed
Details
continuous-integration/drone/pr
Required

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
build

   
cgi Scripting

   
design

   
disruptive

Requires careful coordination and documentation changes

  
documentation

   
duplicate

   
easy

   
feature-request

   
help wanted

   
javascript

   
priority/low

   
question

   
system-hackers

   
tagging

   
text

   
translations

   
wait/bugfix

   
wait/inprogress

   
wait/misc

   
wait/proofread

   
wontfix

   
xsl
No Label
bug
build
cgi Scripting
design
disruptive
documentation
duplicate
easy
feature-request
help wanted
javascript
priority/low
question
system-hackers
tagging
text
translations
wait/bugfix
wait/inprogress
wait/misc
wait/proofread
wontfix
xsl
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: FSFE/fsfe-website#1015
No description provided.
Delete Branch "lucas.lasota:NEWTESTEMONIALS"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?