FSFE
/
fsfe-website
29
30
Bifurcation 85
Code Tickets 61 Demandes d'ajout 14 Wiki Activité

NEWTESTEMONIALS #1015

Fermé
lucas.lasota souhaite fusionner 23 révision(s) depuis lucas.lasota:NEWTESTEMONIALS vers master
tirer les modifications depuis: lucas.lasota:NEWTESTEMONIALS
fusionner dans: FSFE:master
Discussion 1 Révisions 23 Fichiers Modifiés 17 +953 -7
lucas.lasota a commenté 2019-07-10 14:39:53 +00:00.
Membre
Copier le lien

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 a commenté 2019-07-10 15:11:19 +00:00.
Propriétaire
Copier le lien

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 a fermé cette demande d'ajout 2019-07-18 12:41:36 +00:00.
Certains contrôles sont en attente
the build failed
Détails
continuous-integration/drone/pr
Requis

Demande d’ajout fermée

Cette demande d'ajout ne peut pas être rouverte car la branche a été supprimée.
Connectez-vous pour rejoindre cette conversation.
Évaluateurs
Sans évaluateur
Labels
Effacer les 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
Sans labels
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
Jalon
Effacer le jalon
Pas d'élément
Sans jalon
Assignés
Supprimer les affectations
Sans assignation
2 participants
Notifications
Échéance
La date d’échéance est invalide ou hors plage. Veuillez utiliser le format 'aaaa-mm-dd'.

Aucune échéance n'a été définie.

Dépendances

Aucune dépendance définie.

Référence : FSFE/fsfe-website#1015
Sans contenu.
Supprimer la branche "lucas.lasota:NEWTESTEMONIALS"

La suppression d’une branche est permanente. Bien qu’une branche supprimée puisse temporairement subsister, elle NE PEUT PAS être facilement restaurée. Continuer ?