The Troll's factory

Geekeries & pensées
-->

Résoudre un conflit sur le fichier .cproject (Eclipse) dans SVN/Subclipse // Conflict solving for .cproject with SVN/Subclipse

 

English readers : see at the bottom of the French version !!

Hello les amis,

Aujourd’hui, petite astuce qui pourrait faire gagner 1h à des gens qui comme moi, pensent qu’il suffit de résoudre un conflit pour… qu’il soit résolu !

Eh bien non, cela ne semble pas marcher tout à fait pareil avec le plug-in Subclipse pour Eclipse.

Si vous avez le malheur d’avoir un conflit, normalement, il vous suffit de faire clic-droit sur le fichier puis « Team » puis « Mark as resolved ».

SAUF QUE le .cproject n’apparaît bien évidemment pas dans la perspective « ressources » (par défaut) de Eclipse !! Impossible donc de le résoudre !

Or, si vous le résolvez en utilisant SVN via la console par exemple, Subclipse ne s’en « rendra pas compte » (ne me demandez pas pourquoi) et refusera encore et toujours de commiter les futurs changements.

Pour résoudre le conflit, il faut que vous ouvriez la « perspective » « Team Synchronizing », à ce moment-là, vous devriez enfin voir votre .cproject et vous pourrez alors faire Mark as resolved (en sélectionnant ensuite l’option de votre choix sur la résolution du conflit).

Voilà ! Et Subclipse arrêtera de vous harceler avec ce conflit qui n’en est plus un…

Bon dev’ !

 

————————English version (summerized) ———————–

Hi folks,

The .cproject file won’t be displayed on the « resources » perspective (view), so you can’t resolve the conflict by right-clicking and then selecting options « Team » and « Mark as resolved ».

Moreover, solving the conflict using the SVN command line interface won’t work, Subclipse will « remember » the conflict.

To get this working, you have to open the « Team Synchronizing » perspective in Eclipse. There, you should be able to find the .cproject file and so Mark it as resolved (and then select the option you want for the conflict solving way).

Here it is ! Subclipse will stop harassing you !

 

Have a nice dev’ !

Share and Enjoy:
  • Print
  • PDF
  • Twitter
  • Facebook
  • LinkedIn
  • RSS
  • Wikio FR
  • Digg
  • del.icio.us
  • Google Bookmarks
  • Technorati
  • Sphinn
  • Mixx
  • Add to favorites
  • Live
  • Netvibes
  • Scoopeo
  • viadeo FR
  • Identi.ca
  • MySpace
  • StumbleUpon
  • Yahoo! Buzz
posté par Troll dans Scripts, astuces, dév. web avec 1 commentaire

Une réponse à “Résoudre un conflit sur le fichier .cproject (Eclipse) dans SVN/Subclipse // Conflict solving for .cproject with SVN/Subclipse”

  1. vincentvke dit :

    Air Jordan shoes have not only dominated the actual sports and particularly the actual Basketball, but they also have been incorporated into the music world; for instance it’s not anything new to see pop music celebrities enhancing the shoe. Hollywood celebrities too have not been omitted.

    There are a number of countless moment’s celebrities, athletes, and popular music artists have been seen wearing Air Jordan footwear. For example Nike and Jordan Brand have created new brands of Air Jordan shoes specifically designed for the hip hop songs videos which have been as a form of product placement. You will be surprised by how popular Air Jordan footwear is and how many films and hip hop designers wear them in Hollywood.

    The Nike air force 1-Air Jordan 12 blend black green coffee bean released on The month of january 2008 has been a hit with celebrities in the hip hop music within the U.K. The most popular celebrity commonly seen in this brand of Air Jordan shoe is Music performer Lily Allen.

    Music and well-known rapper Kanye West has also been on the celebrities’ lists of those seen wearing Air Jordan shoes. Kanye west has been seen wearing the Air Jordan boots in the most Music Movies. His favorite Air Jordan Shoes are the Air Jordan 8 Aqua. Kanye has been frequently spotted swaying with this pair of Jordans brand whether when performing, playing or watching his preferred sport, the National basketball association basketball league or walking. Carmelo Anthony a well known star player from the Denver Nuggets Has also endorsed the Nike/Jordan brand of boots.

    If you are a normal visitor to Studiolegaleraimondi Air Jordan the Myairshoes website, you will be amazed to find a number of celebrities both men and women adorning the Air Jordan shoes. For instance Rapper Fat Joe enjoys the fire red Air Jordan III sneakers. Rap star Dabrat is also a enjoyable and frequent individual of Air Jordan Another famous celebrity who loves the Air Jordan shoes is rap artist Bow wow. He or she was seen in an image showing off some of his The nike jordan 6 rings.

    Bend wow is said to possess a collection of Air Jordan. He even refers himself the King associated with Jordan with his well-known say of « you just about all can’t touch me when it comes to Air Jordan’s. He’s also made a remix in order to his song « stepped on my Jordan » featuring Dubs.

    Two National basketball association Players, CC Sabathia of the Milwaukee Brewers as well as Derek Lee who plays for the Chicago Puppies; have pairs associated with Air Jordan force V PE’s. Terrell Owens loves rocking along with Air Jordan 6 Olympics. Terrell Owens is a respected as well as regarded American soccer star playing for that Dallas Cowboys in the National Football League.

    Other Celebs fond of Air Jordan shoes are Travis and Disashi of the Gym Class Heroes. Travis is known for wearing the Air penny 2- black/royal blue. While Disashi enjoys sporting the Air Jordan 8 (VIII) Retro – Aqua’s.

    Ludacris another celebrity is usually famously seen rocking with the Air Jordan 3 black/cement. These are just but a few rap celebrities who often rocks wearing Jordans brand of Shoes. In Hollywood there are a number of others who fancy these types of brands of sneakers.

Poster un commentaire

Remplissez le formulaire suivant pour poster un message.
Nom
Email
Site internet
Votre commentaire