Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrections pour fonctionner sur un hébergement mutualisé #222

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

jerrywham
Copy link

(et ça fonctionne également sur un hébergement "normal")

fonctionne également sur un hébergement "normal")
@nodiscc
Copy link
Contributor

nodiscc commented Aug 30, 2016

What specific bugs does this fix?

@jerrywham
Copy link
Author

jerrywham commented Oct 12, 2016

Plusieurs :

  • problèmes de session
  • problèmes de vérifications de fonctions php
  • fonctions php non autorisées par l'hébergeur
  • problème d'extension d'images
  • problèmes de sauvegarde de la configuration
  • vérification de l'existance d'un index dans un tableau
  • suppression des espaces éventuels avant et après un chemin de fichier
  • problème dans le core de Cake
    entre autres...

@lGuillaume124
Copy link
Contributor

Hi,
Thanks for your hard work. Could you rebase the pull-request on the development branch please?

@jerrywham
Copy link
Author

Je ne sais pas comment on fait... :)

@MightyCreak
Copy link
Contributor

MightyCreak commented Oct 25, 2016

@lGuillaume124 Could it be possible to use a more regular process? In the other git projects, master is the dev branch containing the latest code, a branch is created at a specific commit when a release is done, so we can cherry-pick commits from master into the stable version(s).

@jerrywham Try this:

git pull
git checkout development
git rebase master

If you're lucky, you won't have conflicts.

@jerrywham
Copy link
Author

Ça n'a pas fonctionné car il y a un conflit avec le fichier app/Controller/SongsController.php.
Voici ce que me dit mon terminal :

JW:sonerezh JW$ git pull
Already up-to-date.
JW:sonerezh JW$ git checkout development
Branch development set up to track remote branch development from origin.
Switched to a new branch 'development'
JW:sonerezh JW$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: Syntax
Applying: Fix #183: Bug if the artist string contains "$"
Applying: Ignore *.mp3 and *.ogg files generated by auto-conversion
Applying: Fix #183, and properly escape avconv args to avoid arbitrary code execution
Applying: Remove html tags from Flash() messages
Using index info to reconstruct a base tree...
M   app/Controller/SongsController.php
Falling back to patching base and 3-way merge...
Auto-merging app/Controller/SongsController.php
CONFLICT (content): Merge conflict in app/Controller/SongsController.php
Failed to merge in the changes.
Patch failed at 0005 Remove html tags from Flash() messages

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".

et là, c'est le drame...

@MightyCreak
Copy link
Contributor

You just have a conflict in app/Controller/SongsController.php if you have a 3-way merge tool, try it. Otherwise open the file with a text editor and search for lines with <<<<<<<<<, ========, and >>>>>>>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants