Home Forums Wiki Doc Install Extras Screenshots Source Code Projects Blog Users Groups Register
Glx-Dock / Cairo-Dock List of forums Git Version | Version Git [1413] conflits
The latest stable release is the *3.4.0* : How to install it here.
Note: We just switched from BZR to Git on Github! (only to host the code and your future pull requests)
Git Version | Version Git

Subjects Author Language Messages Last message
[Locked] [1413] conflits
parAdOxxx_ZeRo Français 5 parAdOxxx_ZeRo [Read]
29 November 2008 à 18:06

parAdOxxx_ZeRo, Wednesday 26 November 2008 à 14:39


Subscription date : 14 January 2008
Messages : 1122
Recherche des mises à jour pour clock

Conflict discovered in 'plug-ins/clock/data/digital/Makefile.in'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: tf
Conflict discovered in 'plug-ins/clock/data/digital/default/Makefile.in'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: tf
Conflict discovered in 'plug-ins/clock/data/digital/default/Makefile'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: tf
Conflict discovered in 'plug-ins/clock/data/digital/Makefile'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: tf
Updated to revision 1413.


Bah alors

edit :

Recherche des mises à jour pour Animated-icons

Conflict discovered in 'plug-ins/Animated-icons/data/Makefile'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: tf
Updated to revision 1413.
Une mise à jour du plugin Animated-icons a été détéctée


Recherche des mises à jour pour drop-indicator

Conflict discovered in 'plug-ins/drop-indicator/src/Makefile'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: tf
Updated to revision 1413.
Une mise à jour du plugin drop-indicator a été détéctée


Recherche des mises à jour pour motion-blur

Conflict discovered in 'plug-ins/motion-blur/config.log'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: tf
Conflict discovered in 'plug-ins/motion-blur/config.status'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: tf
Conflict discovered in 'plug-ins/motion-blur/src/Makefile'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: tf
Conflict discovered in 'plug-ins/motion-blur/data/Makefile'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: tf
Conflict discovered in 'plug-ins/motion-blur/Makefile'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: tf
Conflict discovered in 'plug-ins/motion-blur/po/Makefile.in'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: tf
Conflict discovered in 'plug-ins/motion-blur/po/Makefile'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: tf
Updated to revision 1413.
Une mise à jour du plugin motion-blur a été détéctée

Mav, Wednesday 26 November 2008 à 15:38


Subscription date : 29 November 2007
Messages : 3146
Oui, je ne sais pas comment forcer l'update d'un fichier avec la copie distante et ne pas comparer avec la copie locale

fabounet, Wednesday 26 November 2008 à 16:59


Subscription date : 30 November 2007
Messages : 17118
mais les Makefile sont pas sur le SVN, pourquoi il nous sort ça ?

Mav, Wednesday 26 November 2008 à 17:04


Subscription date : 29 November 2007
Messages : 3146
Bah si en fait

ex : 'plug-ins/drop-indicator/src/Makefile' -> sur le SVN
http://svn.berlios.de/wsvn/cairo-dock/trunk/plug-ins/drop-indicator/src/Makefile

fabounet, Wednesday 26 November 2008 à 17:06


Subscription date : 30 November 2007
Messages : 17118
arf, c'est moche !
il faut les virer de là.

parAdOxxx_ZeRo, Saturday 29 November 2008 à 18:06


Subscription date : 14 January 2008
Messages : 1122
Mav :
Oui, je ne sais pas comment forcer l'update d'un fichier avec la copie distante et ne pas comparer avec la copie locale


svn up --accept 'theirs-full'


ca devrait marcher...

Git Version | Version Git

Subjects Author Language Messages Last message
[Locked] [1413] conflits
parAdOxxx_ZeRo Français 5 parAdOxxx_ZeRo [Read]
29 November 2008 à 18:06


Glx-Dock / Cairo-Dock List of forums Git Version | Version Git [1413] conflits Top

Online users :

Powered by ElementSpeak © 2007 Adrien Pilleboue, 2009-2013 Matthieu Baerts.
Dock based on CSS Dock Menu (Ndesign) with jQuery. Icons by zgegball
Cairo-Dock is a free software under GNU-GPL3 licence. First stable version created by Fabounet.
Many thanks to TuxFamily for the web Hosting and Mav for the domain name.