Skip to main content

On fusionne les branches et on observe

Fusion avec Mercurial

Chaque binôme a travaillé sur sa branche, et il est temps de fusionner le travail.

Chacun a fait ses classes PHP, selecteurs CSS, morceaux de code Javascript/jQuery,... dans sa propre branche.

C'est l'organisation typique d'un projet chez Ideo Neov, qui nécessite qu'on fusionne à un moment donné.

Racontez comment ça se passe de fusionner:

  • quels problèmes inattendus?
  • quelles solutions inattendues?
  • quelles réactions face aux évènements?
  • ...

Popular posts from this blog

npm run build base-href

Using NPM to specify base-href When building an Angular application, people usually use "ng" and pass arguments to that invocation. Typically, when wanting to hard code "base-href" in "index.html", one will issue: ng build --base-href='' I used to build my angular apps through Bamboo or Jenkins and they have a "npm" plugin. I got the habit to build the application with "npm run build" before deploying it. But the development team once asked me to set the "--base-href=''" parameter. npm run build --base-href=' did not set the base href in indext.html After looking for a while, I found where it says: You need to use −− to pass arguments to npm scripts. This did the job! The command to issue is then: npm run build -- --base-href='

Jenkins invalid privatekey

Publish over SSH, Message "invalid privatekey:" With quite recent (June-July 2020) installations of Jenkins and OpenSSH, I have the following error message when using the "Deploy overs SSH" Jenkins plug-in and publishing artifacts to the target overs SSH: jenkins.plugins.publish_over.BapPublisherException: Failed to add SSH key. Message [invalid privatekey: [B@d8d395a] This problem seems to be referenced here: Just regenerate a key with the right parameters To solve it: ssh-keygen -t rsa -b 4096 Or ssh-keygen -t rsa -b 4096 -m PEM

Emacs Pulumi LSP

Install Pulumi Emacs Mode The source code is on At the very bottom of the page are the instructions on how to install. You Need to have make installed. $ make install emacs-client mkdir -p ./bin go build -ldflags "-X" -o ./bin -p 10 ./cmd/... go: downloading v3.53.1 ... ... ... go install -ldflags "-X" ./cmd/... mkdir -p editors/emacs/bin cd editors/emacs && emacs -Q --batch --eval "(progn (setq package-user-dir \"$(pwd)/bin\" \ package-archives '((\"melpa\" . \"\") \