<!-- If the browser does not support frames put the first topic content here --> <div class="WordSection1"> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <span style= 'font-size:28.0pt;font-family:"Times New Roman",serif; color:red'>GIT SOUS NETBEANS</span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:18.0pt;font-family:"Times New Roman",serif;color:#1F497D'> Utilisation de github et de l'outil client : NetBeans</span></b></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <u><span style= 'font-size:14.0pt;font-family:"Times New Roman",serif'>"Remonter" un projet sous github :</span></u></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <div style= 'border:solid windowtext 1.0pt;padding:1.0pt 4.0pt 1.0pt 4.0pt'> <p class="MsoNormal" style= 'margin-bottom:0cm;line-height:normal;border:none; padding:0cm'> <u><span style='font-family:"Times New Roman",serif'>Travail préalable sous github.com</span></u></p> <p class="MsoNormal" style= 'margin-bottom:0cm;line-height:normal;border:none; padding:0cm'> <span style= 'font-family:"Times New Roman",serif'> <span style='color:red'>*</span> Se connecter à votre repository</span></p> <p class="MsoNormal" style= 'margin-bottom:0cm;line-height:normal;border:none; padding:0cm'> <span style= 'font-family:"Times New Roman",serif'> <span style='color:red'>*</span> Menu settings (du menu en haut à droite <img width="22" height="18" id="Image 1" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image002.gif" alt="image" name="Image 1" />)</span></p> <p class="MsoNormal" style= 'margin-bottom:0cm;line-height:normal;border:none; padding:0cm'> <span style= 'font-family:"Times New Roman",serif'> <span style='color:red'>*</span> Sous-menu Developper settings</span></p> <p class="MsoNormal" style= 'margin-bottom:0cm;line-height:normal;border:none; padding:0cm'> <span style= 'font-family:"Times New Roman",serif'> <span style='color:#1F3864'>-</span> <Personal Access Token></span></p> <p class="MsoNormal" style= 'margin-bottom:0cm;line-height:normal;border:none; padding:0cm'> <span style= 'font-family:"Times New Roman",serif'> <span style='color:#1F3864'>-</span> "Token classic"</span></p> <p class="MsoNormal" style= 'margin-bottom:0cm;line-height:normal;border:none; padding:0cm'> <span style= 'font-family:"Times New Roman",serif'> <span style='color:#1F3864'>-</span> <img width="149" height="30" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image003.gif" alt="image" /> classic</span></p> <p class="MsoNormal" style= 'margin-bottom:0cm;line-height:normal;border:none; padding:0cm'> <span style= 'font-family:"Times New Roman",serif'> <span style='color:#1F3864'>-</span> Saisir un message, choisir le délai d'expiration et cocher au moins <repo>.</span></p> <p class="MsoNormal" style= 'margin-bottom:0cm;line-height:normal;border:none; padding:0cm'> <b><span style= 'font-family:"Times New Roman",serif;color:red'> !!! Penser à copier ce token pour les étapes suivantes (pour le remote sous Netbeans)</span></b></p> </div> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm'><u><span style= 'font-family:"Times New Roman",serif'>Principe</span></u> <span style='font-family:"Times New Roman",serif'>: Copier un projet à partir un repository local vers un repository distant</span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:14.2pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'>Après création d'un repository (dossier de dépôt) sous github (<a href= "https://github.com/">https://github.com</a>).</span></p> <p class="MsoListParagraph" style= 'margin-top:6.0pt;margin-right:0cm;margin-bottom: 12.0pt;margin-left:50.15pt;text-indent:-17.85pt;line-height:normal'> <span style='font-family:Symbol'><img width="12" height="12" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image001.gif" alt="*" /><span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style='font-family:"Times New Roman",serif'>Ouvrir localement sous NetBeans le projet à "partager" sous github.</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:50.15pt;text-indent:-17.85pt;line-height:normal'> <span style='font-family:Symbol'><img width="12" height="12" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image001.gif" alt="*" /><span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style='font-family:"Times New Roman",serif'>Initialiser un repository git (local)</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'><Team></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'><Git></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Initialize Repository…></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Choisir le dossier de dépôt local ( il est préférable de le laisser dans le dossier proposé)</span></p> <p class="MsoListParagraph" style= 'margin-top:18.0pt;margin-right:0cm;margin-bottom: 0cm;margin-left:50.15pt;text-indent:-17.85pt;line-height:normal'> <span style='font-family:Symbol'><img width="12" height="12" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image001.gif" alt="*" /><span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style='font-family:"Times New Roman",serif'>Faire un "commit" (maj sur le repository local précédemment choisi)</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'><Team></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Commit…></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Saisir un message évocateur</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Choisir les fichiers à "versionner"</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <<span style='color:red'>Commit</span>></span></p> <p class="MsoListParagraph" style= 'margin-top:18.0pt;margin-right:0cm;margin-bottom: 0cm;margin-left:50.15pt;text-indent:-17.85pt;line-height:normal'> <span style='font-family:Symbol'><img width="12" height="12" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image001.gif" alt="*" /><span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style='font-family:"Times New Roman",serif'> Envoyer ("partager") du repository local vers le repository distant (github)</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'><Team></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <remote></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <<span style='color:red'>Push</span>></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Saisir l'URL du repository (copier de github : https:…)</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Saisir le user (celui précisé dans l'url précédente)</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Dans Password <b><span style='color:red'>coller le token copié de Github</span></b></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Next></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Choisir la branche (ou laisser Master)</span></p> <p class="MsoListParagraphCxSpLast" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Finish></span></p> <p class="MsoNormal" style= 'margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm; margin-left:67.05pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'>(Si problème "forward…" c'est qu'il y a divergence entre le dépôt local et dépôt distant (des "nouveautés" sur les 2). Faire alors un <Remote> <<span style='color:red'>pull</span>> pour "récupérer" les changements du repository distant puis refaire un push.</span></p> <span style= 'font-size:11.0pt;line-height:115%;font-family:"Times New Roman",serif'><br clear="all" style='page-break-before:always' /></span> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <u><span style= 'font-size:14.0pt;font-family:"Times New Roman",serif'>"Cloner" un projet à partir de github :</span></u></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm'><u><span style= 'font-family:"Times New Roman",serif'>Principe</span></u> <span style='font-family:"Times New Roman",serif'>: Copier un projet à partir un repository distant vers un repository local</span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'>A partir de NetBeans, sans aucun projet ouvert.</span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> <Team></span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> <remote></span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> <clone></span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> Saisir le repository URL (copier de github : https://...)</span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> Saisir le user et copier le token d'un des membres dans password</span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> <Next></span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> Cocher "Master"</span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> <Next></span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> Choisir "Parent Directory" et name of clone (éventuellement laisser les propositions)</span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> <Finish></span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> <Open Project></span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:-7.1pt;margin-bottom: 0cm;margin-left:0cm'> <span style='font-family:"Times New Roman",serif'>Si des problèmes apparaissent cliquer sur <Resolve Problems> et chercher le .jar et le .zip manquant(s).</span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <u><span style= 'font-size:14.0pt;font-family:"Times New Roman",serif'>Les branches</span></u></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'>L'intérêt des branches est d'avoir plusieurs versions du projet sous github (une branche de test, une branche validée…) et de pouvoir "repartir" avec une de ses versions. Plus complet qu'un simple <i>Revert</i>.</span></p> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> </span></p> <span style= 'font-size:11.0pt;line-height:115%;font-family:"Times New Roman",serif'><br clear="all" style='page-break-before:always' /></span> <p class="MsoNormal" style='margin-bottom:0cm'><span style= 'font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <u><span style= 'font-size:14.0pt;font-family:"Times New Roman",serif'>Les fonctions importantes du versionning :</span></u></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><u><span style= 'font-family:"Times New Roman",serif'>Commit</span></u></b></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style= 'font-family:"Times New Roman",serif'>Signification : Permet de mettre à jour le repository local à partir du projet sous NetBeans.</span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'>Démarche :</span></p> <p class="MsoListParagraphCxSpFirst" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'><Team></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Commit></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Saisir un message évocateur</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Choisir les fichiers</span></p> <p class="MsoListParagraphCxSpLast" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Commit></span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><u><span style= 'font-family:"Times New Roman",serif'>Push</span></u></b></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style= 'font-family:"Times New Roman",serif'>Signification : Envoyer ("partager") du repository local vers le repository distant.</span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'>Démarche :</span></p> <p class="MsoListParagraphCxSpFirst" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'><Team></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Remote></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Push></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Choisir un "Remote name"</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Saisir l'URL du repository (copier de github : https:…)</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Saisir le user et copier le token dans password</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Next></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Choisir la branche (ou laisser Master)</span></p> <p class="MsoListParagraphCxSpLast" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Finish></span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><u><span style= 'font-family:"Times New Roman",serif'>Pull</span></u></b></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style= 'font-family:"Times New Roman",serif'>Signification : Envoyer ("partager") du repository distant vers le repository local.</span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'>Démarche :</span></p> <p class="MsoListParagraphCxSpFirst" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'><Team></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <remote></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Pull></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Saisir l'URL du repository (copier de github : https:…)</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Saisir le user et copier le token dans password</span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Next></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> Choisir la branche (ou laisser Master)</span></p> <p class="MsoListParagraphCxSpLast" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Finish></span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <span style= 'font-size:11.0pt;font-family:"Times New Roman",serif'><br clear= "all" style='page-break-before:always' /></span> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><u><span style= 'font-family:"Times New Roman",serif'>Checkout</span></u></b></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style= 'font-family:"Times New Roman",serif'>Signification : Restaure le projet sous NetBeans à partir du repository local.</span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'>Démarche :</span></p> <p class="MsoListParagraphCxSpFirst" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'><Team></span></p> <p class="MsoListParagraphCxSpMiddle" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Checkout> puis <Checkout files></span></p> <p class="MsoListParagraphCxSpLast" style= 'margin-top:6.0pt;margin-right:0cm; margin-bottom:0cm;margin-left:3.0cm;text-indent:-18.0pt;line-height:normal'> <span style='font-family:Symbol'>·<span style= 'font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-family:"Times New Roman",serif'> <Checkout></span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:0cm;margin-bottom:0cm; margin-left:4.0cm;text-indent:-70.85pt;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> <span style= 'font-size:11.0pt;font-family:"Times New Roman",serif'><br clear= "all" style='page-break-before:always' /></span> <p class="MsoNormal" style='line-height:normal'><i><span style= 'font-size:22.0pt; font-family:"Times New Roman",serif;color:red'>Tutoriel complet et officiel (en anglais </span></i> <i><span style= 'font-size:22.0pt;font-family:Wingdings; color:red'>J</span></i><i><span style='font-size:22.0pt;font-family:"Times New Roman",serif; color:red'>)</span></i></p> <p class="MsoNormal" style='line-height:normal'><b><span style= 'font-size:24.0pt; font-family:"Times New Roman",serif'>Using Git Support in NetBeans IDE</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>The NetBeans IDE provides support for the Git version control client. The IDE's Git support allows you to perform versioning tasks directly from your project within the IDE. This document demonstrates how to perform basic versioning tasks in the IDE by guiding you through the standard workflow when using versioning software.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Git is a free and open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency. Every Git clone is a full-fledged repository with complete history and full revision tracking capabilities, not dependent on network access or a central server. Branching and merging are fast and easy to do. Git is used for version control of files, much like tools such as Mercurial, Subversion, CVS, Perforce, etc.</span></p> <p class="MsoNormal" style='line-height:normal'><b><span style= 'font-size:13.5pt; font-family:"Times New Roman",serif'>Contents</span></b></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="114" height="115" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image004.gif" alt= "Content on this page applies to NetBeans IDE 7.4 and 8.0" /></span></p> <ul type="disc"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#initialize">Initializing a Git Repository</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#clone">Cloning a Git Repository</a></span></li> <li style="list-style: none; display: inline"> <ul type="circle"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#github">Cloning a Repository from GitHub via SSH Protocol</a></span></li> </ul> </li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#add">Adding Files to a Git Repository</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#editing">Editing Files</a></span></li> <li style="list-style: none; display: inline"> <ul type="circle"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#viewChanges">Viewing Changes in the Source Editor</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#viewFileStatus">Viewing File Status Information</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#diff">Comparing File Revisions</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#revert">Reverting Changes</a></span></li> </ul> </li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#committing">Committing Sources to a Repository</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#branch">Working with Branches</a></span></li> <li style="list-style: none; display: inline"> <ul type="circle"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#branchCreate">Creating a Branch</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#branchCheckOut">Checking Out a Branch</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#branchMerge">Merging</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#branchDelete">Deleting a Branch</a></span></li> </ul> </li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#remote">Working with Remote Repositories</a></span></li> <li style="list-style: none; display: inline"> <ul type="circle"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#fetch">Fetching</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#pull">Pulling</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#push">Pushing</a></span></li> </ul> </li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#summary">Summary</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#seealso">See Also</a></span></li> </ul> <b><span style= 'font-size:18.0pt;font-family:"Times New Roman",serif'><br clear= "all" style='page-break-before:always' /></span></b> <p class="MsoNormal" style='line-height:normal'><a name="reqs" id= "reqs"></a><b><span style= 'font-size:18.0pt;font-family:"Times New Roman",serif'>Requirements</span></b></p> <p class="MsoNormal" style='line-height:normal'><b><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To complete this tutorial, you need the following software and resources.</span></b></p> <table class="MsoNormalTable" border="0" cellpadding="0"> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Software or Resource</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Version Required</span></b></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><a href= "https://netbeans.org/downloads/index.html" target= "_blank">NetBeans IDE</a></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Version 7.4 or 8.0</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><a href= "http://www.oracle.com/technetwork/java/javase/downloads/index.html" target="_blank">Java Development Kit</a> (JDK)</span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Version 7 or 8</span></p> </td> </tr> </table> <p class="MsoNormal" style='line-height:normal'><a name= "initialize" id="initialize"></a><b><span style= 'font-size:18.0pt;font-family:"Times New Roman",serif'>Initializing a Git Repository</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To initialize a Git repository from existing files that are not in source control yet, you need to complete the following steps:</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Projects window, select an unversioned project and right-click the project name.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the context menu, choose</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Versioning</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>></span> <span style='font-size:10.0pt;font-family:"Courier New"'>Initialize Git Repository</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>(alternatively, in the main menu, choose</span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Team</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>></span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Git</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>></span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Initialize</span><span style='font-size: 12.0pt;font-family:"Times New Roman",serif'>).</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/initialize-git-repo.png" title=""Plugins dialog box" "><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif;text-decoration:none'> <img border="0" width="300" height="330" id="Image 2" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image005.jpg" alt="Plugins dialog box" name="Image 2" /></span></a></p> <ol start="3" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Specify the path to the repository you are going to store your versioned files in the</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Initialize a Git Repository</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>dialog box or click Browse and browse for the directory required.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Click OK.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>A</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>.git</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>subfolder is created in the folder you specified in step 3 above (your NetBeans project folder by default), which is your Git repository where all the data of your project snapshots are stored. Git starts versioning all files in the folder you specified.<br /> You can open</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Window</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>></span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Output</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>></span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Output</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>to view the IDE's report about the progress of the repository creation under your local working directory.</span></p> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="440" height="109" id="Image 3" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image006.jpg" alt="Output window" name="Image 3" /></span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>All the project files are marked</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Added</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>in your Working Tree. To view a file <a href= "https://netbeans.org/kb/docs/ide/git.html#viewFileStatus">status</a>, place the cursor over the file name in the Projects window. The status of the file in the Working Tree displays in green to the right of the slash like shown in the following picture.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><img border="0" width="364" height="162" id="Image 4" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image007.jpg" alt="New in Working Tree" name="Image 4" /></span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>After you initialized the Git repository, you either <a href= "https://netbeans.org/kb/docs/ide/git.html#add">add</a> files or directly <a href= "https://netbeans.org/kb/docs/ide/git.html#committing">commit</a> them to the Git repository.</span></p> <p class="MsoNormal" style='line-height:normal'><a name="clone" id= "clone"></a><b><span style= 'font-size:18.0pt;font-family:"Times New Roman",serif'>Cloning a Git Repository</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To get a copy of an already existing Git repository, you need to clone it. Make sure you know the Git repository URL before starting the Clone Repository wizard in the IDE.</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Choose</span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Team</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>></span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Git</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>></span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Clone</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>from the main menu. The Clone Repository wizard displays.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/clone-wizard.png" title=""Clone Repository wizard" "><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif;text-decoration:none'> <img border="0" width="400" height="167" id="Image 5" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image008.jpg" alt="Clone Repository wizard" name="Image 5" /></span></a></p> <ol start="2" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>At the Repository page, specify the path to a Git repository location, user name and password (you can save them for the future if required).</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>(Optional) Click Proxy Configuration to display the Options dialog box and set the proxy server settings. Click OK when finished.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Click Next to switch to the next step of the wizard.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>At the Remote Branches page, select the repository branch(es) to be fetched (downloaded) to your local repository. Click Next.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>At the Destination Directory page, specify the following:</span> <ul type="circle"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Parent Directory field, the path to the directory intended for the cloned repository on your hard drive (alternatively, click the Browse button and navigate to the directory).<br /> The Parent Directory field is pre-filled with the path to the default</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>NetBeansProjects</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>directory where all NetBeans projects are stored.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Clone Name field, the name of the local folder where the original project will be cloned to.<br /> By default Clone Name is filled out with the actual Git repository name.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Checkout Branch field, select the branch to be checked out into the working tree.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Remote Name field, the name that represents the original repository being cloned.<br /></span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>origin</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>is the default alias of the repository being cloned. It is a recommended value.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Leave the Scan for NetBeans Projects after Clone checkbox selected to activate after-scanning right after the clone finishes. (The plugin searches for NetBeans projects in the cloned resources and offers to open the found projects.)</span></li> </ul> </li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Click Finish.<br /> After a Git repository is cloned, the metadata</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>.git</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>folder is created inside the folder you selected in the wizard.</span></li> </ol> <p class="MsoNormal" style='line-height:normal'><a name="github" id="github"></a><b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'>Cloning a Repository from GitHub via SSH protocol</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To clone a repository from GitHub via the SSH protocol, proceed as follows:</span></p> <p class="MsoNormal" style='line-height:normal'><b><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Note:</span></b> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>You need to have a GitHub account and be a project member in order to clone via SSH.</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Choose</span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Team</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>></span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Git</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>></span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Clone</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>from the main menu. The Clone Repository wizard displays.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>At the Remote Repository page of the Clone Repository wizard, specify the path to the repository required in the Repository URL field, for example,</span> <span style= 'font-size:10.0pt; font-family:"Courier New"'>git@github.com:tstupka/koliba.git</span><span style='font-size:12.0pt;font-family:"Times New Roman",serif'>.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Verify</span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>git</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>is specified in the Username text field.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Select the Private/public key option.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>(<b>Skip if using SSH-agent or Pageant for automated SSH access to the Git server.</b>) Complete the following steps to access the Git server using your private SSH key and a passphrase:</span> <ol start="1" type="a"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Specify the path to the key file, for example</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>C:\Users\key</span><span style='font-size:12.0pt;font-family:"Times New Roman",serif'>.</span></li> </ol> </li> </ol> <p class="MsoNormal" style='margin-left:72.0pt;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Note:</span></b> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>The OpenSSH private key format is required. Keys generated by PuTTYgen for Microsoft Windows must be converted to the OpenSSH format before using them in the IDE.</span></p> <ol start="5" type="1"> <li style="list-style: none; display: inline"> <ol start="2" type="a"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Enter the passphrase for the key file, for example,</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>abcd</span><span style='font-size:12.0pt;font-family:"Times New Roman",serif'>.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>(Optional) Select the Save Passphrase option if required.</span></li> </ol> </li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>(<b>Applies if using SSH-agent or Pageant for automated SSH access to the Git server.</b>) Leave the Private Key File and Passphrase fields empty to get authenticated access from the IDE to the Git server via correctly configured SSH-agent or Pageant.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>(Optional) Click Proxy Configuration to display the Options dialog box and set the proxy server settings. Click OK when finished.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/github-repo.png" title= ""Remote Repository page of the Clone Repository wizard" "> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif;text-decoration: none'> <img border="0" width="400" height="233" id="Image 6" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image009.jpg" alt="Remote Repository page of the Clone Repository wizard" name= "Image 6" /></span></a></p> <ol start="8" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Click Next.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>At the Remote Branches page, select the repository branch(es) to be fetched (downloaded) to your local repository, for example</span> <span style= 'font-size:10.0pt;font-family: "Courier New"'>master</span><span style='font-size:12.0pt;font-family: "Times New Roman",serif'>.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/github-branches.png" title= ""Remote Branches page of the Clone Repository wizard" "><span style='font-size:12.0pt;font-family:"Times New Roman",serif;text-decoration: none'> <img border="0" width="400" height="206" id="Image 7" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image010.jpg" alt="Remote Branches page of the Clone Repository wizard" name= "Image 7" /></span></a></p> <ol start="10" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Click Next.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>At the Destination Directory page, specify the following:</span></li> </ol> <div style="margin-left: 2em" start="11" type="1"> <ul type="circle"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Parent Directory field, the path to the directory intended for the cloned repository on your hard drive (alternatively, click the Browse button and navigate to the directory).<br /> The Parent Directory field is pre-filled with the path to the default</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>NetBeansProjects</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>directory where all NetBeans projects are stored.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Clone Name field, the name of the local folder where the original project will be cloned to.<br /> By default Clone Name is filled out with the actual Git repository name.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Checkout Branch field, select the branch to be checked out into the working tree.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Remote Name field, the name that represents the original repository being cloned.<br /></span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>origin</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>is the default alias of the repository being cloned. It is a recommended value.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Leave the Scan for NetBeans Projects after Clone checkbox selected to activate after-scanning right after the clone finishes. (The plugin searches for NetBeans projects in the cloned resources and offers to open the found projects.)</span></li> </ul> </div> <p class="MsoNormal" style='margin-left:72.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/github-destination.png" title= ""Destination Directory of the Clone Repository wizard" "> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif;text-decoration: none'> <img border="0" width="400" height="206" id="Image 8" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image011.jpg" alt="Destination Directory of the Clone Repository wizard" name= "Image 8" /></span></a></p> <ol start="12" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Click Finish.<br /> After the repository is cloned, the Clone Completed message displays.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="266" height="164" id="Image 9" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image012.jpg" alt="Clone Completed message" name="Image 9" /></span></p> <ol start="13" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Choose the desired option.</span></li> </ol> <p class="MsoNormal" style='line-height:normal'><a name="add" id= "add"></a><b><span style= 'font-size:18.0pt;font-family:"Times New Roman",serif'>Adding Files to a Git Repository</span></b></p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <a name="ide" id="ide"></a><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>To start tracking a new file and also to stage changes to an already tracked file in the Git repository, you need to add it to the repository.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>When adding files to a Git repository, the IDE composes and saves snapshots of your project first in the Index. After you perform the commit, the IDE saves those snapshots in the HEAD. The IDE allows you to choose between the two workflows described in the following table.</span></p> <table class="MsoNormalTable" border="0" cellpadding="0"> <tr> <td width="100" style= 'width:75.0pt;padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Workflow Description</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Explicitly add new or modified files to the Index and then commit only those that are staged in the Index to the HEAD</span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Skip adding new or modified files to the Index and commit the required files directly to the HEAD</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Steps to Follow the Workflow</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Projects window, right-click the file you want to add.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the context menu, choose</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Git</span> <span style='font-size:12.0pt;font-family:"Times New Roman",serif'>></span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Add</span><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>.<br /> This adds the file contents to the Index before you commit it.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Projects window, right-click the file you want to commit.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Commit dialog box, select the Changes between HEAD and Index ( <img border="0" width="22" height="22" id="Image 10" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image013.jpg" alt="Changes between HEAD and Index icon" name="Image 10" />) toggle button.<br /> This displays the list of files that are already staged.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Commit the file(s) as described in the <a href= "https://netbeans.org/kb/docs/ide/git.html#committing">Committing Sources to a Repository</a> section below.</span></li> </ol> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Projects window, right-click the file you want to commit.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the context menu, choose</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Git</span> <span style='font-size:12.0pt;font-family:"Times New Roman",serif'>></span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Commit</span><span style='font-size:12.0pt;font-family:"Times New Roman",serif'>.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Commit dialog box, select the Select the Changes between Index and Working Tree (<img border="0" width="22" height="22" id="Image 11" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image014.jpg" alt="Changes between HEAD and Working Tree icon" name= "Image 11" />) toggle button.<br /> This displays the list of files that are not staged.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Commit the file(s) as described in the <a href= "https://netbeans.org/kb/docs/ide/git.html#committing">Committing Sources to a Repository</a> section below.</span></li> </ol> </td> </tr> </table> <p class="MsoNormal" style='line-height:normal'><b><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Note:</span></b> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>The <a href="https://netbeans.org/kb/docs/ide/git.html#viewFileStatus">status</a> of the file in the HEAD displays in green to the left of the slash like shown in the following picture.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><img border="0" width="361" height="163" id="Image 12" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image015.jpg" alt="New in Staging Area" name="Image 12" /></span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>The action works recursively if invoked on folders while respecting the NetBeans IDE flat folder content structure.</span></p> <p class="MsoNormal" style='line-height:normal'><a name="editing" id="editing"></a><b><span style= 'font-size:18.0pt;font-family:"Times New Roman",serif'>Editing Files</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Once you have a Git versioned project opened in the IDE, you can begin making changes to sources. As with any project opened in NetBeans IDE, you can open files in the Source Editor by double-clicking on their nodes, as they appear in the IDE's windows (e.g., Projects (Ctrl-1), Files (Ctrl-2), Favorites (Ctrl-3) windows).</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>When working with source files in the IDE, there are various UI components at your disposal, which aid in both viewing and operating version control commands:</span></p> <ul type="disc"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#viewChanges">Viewing Changes in the Source Editor</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#viewFileStatus">Viewing File Status Information</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#revert">Reverting Changes</a></span></li> </ul> <p class="MsoNormal" style='line-height:normal'><a name= "viewChanges" id="viewChanges"></a><b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'>Viewing Changes in the Source Editor</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>When you open a versioned file in the IDE's Source Editor, you can view real-time changes occurring to your file as you modify it against the base version from the Git repository. As you work, the IDE uses color coding in the Source Editor's margins to convey the following information:</span></p> <table class="MsoNormalTable" border="0" cellpadding="0"> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Blue</span></b> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>( <span style= 'color:black;background:#B8CFE5'> </span> )</span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Indicates lines that have been changed since the earlier revision.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Green</span></b> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>( <span style= 'color:black;background:#B4FFB4'> </span> )</span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Indicates lines that have been added since the earlier revision.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Red</span></b> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>( <span style= 'color:black;background:#FFA0B4'> </span> )</span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Indicates lines that have been removed since the earlier revision.</span></p> </td> </tr> </table> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>The Source Editor's left margin shows changes occurring on a line-by-line basis. When you modify a given line, changes are immediately shown in the left margin.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><img border="0" width="416" height="201" id="Image 13" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image016.jpg" alt="Left Margin" name="Image 13" /></span></p> <p class="MsoNormal" style='line-height:normal'><b><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Note:</span></b> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>You can click on a color grouping in the margin to call versioning commands. For example, the picture below shows widgets available to you when clicking a red icon which indicates that lines have been removed from your local copy:</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><img border="0" width="401" height="200" id="Image 14" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image017.jpg" alt="Widgets Available" name="Image 14" /></span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>The Source Editor's right margin provides you with an overview that displays changes made to your file as a whole, from top to bottom. Color coding is generated immediately when you make changes to your file.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><img border="0" width="518" height="105" id="Image 15" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image018.jpg" alt="Right Margin" name="Image 15" /></span></p> <p class="MsoNormal" style='line-height:normal'><b><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Note</span></b><span style='font-size: 12.0pt;font-family:"Times New Roman",serif'>: You can click on a specific point within the margin to bring your inline cursor immediately to that location in the file. To view the number of lines affected, hover your mouse over the colored icons in the right margin:</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><img border="0" width="581" height="102" id="Image 16" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image019.jpg" alt="Widgets Available" name="Image 16" /></span></p> <p class="MsoNormal" style='line-height:normal'><a name= "viewFileStatus" id="viewFileStatus"></a><b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'>Viewing File Status Information</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>When you are working in the Projects (Ctrl-1), Files (Ctrl-2), Favorites (Ctrl-3), or Versioning views, the IDE provides several visual features that aid in viewing status information about your files. In the example below, notice how the badge (e.g. <img border="0" width="6" height="8" id="Image 17" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image020.jpg" alt="Blue badge" name="Image 17" />), color of the file name, and adjacent status label, all coincide with each other to provide you with a simple but effective way to keep track of versioning information on your files:</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><img border="0" width="362" height="173" id="Image 18" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image021.jpg" alt="File Status Info" name="Image 18" /></span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Badges, color coding, file status labels, and perhaps most importantly, the Git Diff Viewer all contribute to your ability to effectively view and manage versioning information in the IDE.</span></p> <ul type="disc"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#badges">Badges and Color Coding</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#fileStatus">File Status Labels</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#versioningView">Git Versioning View</a></span></li> </ul> <p class="MsoNormal" style='line-height:normal'><a name="badges" id="badges"></a><b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Badges and Color Coding</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Badges are applied to project, folder, and package nodes and inform you of the status of files contained within that node:</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>The following table displays the color scheme used for badges:</span></p> <table class="MsoNormalTable" border="0" cellpadding="0"> <tr> <td width="110" style= 'width:82.5pt;padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'><a name= "badges-color-scheme" id="badges-color-scheme"></a><b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>UI Component</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Description</span></b></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Blue Badge</span></b> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>(<img border="0" width="6" height="8" id="Image 19" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image020.jpg" alt="Blue badge" name="Image 19" />)</span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Indicates the presence of files that have been modified, added or deleted in your working tree. For packages, this badge applies only to the package itself and not its subpackages. For projects or folders, the badge indicates changes within that item, or any of the contained subfolders.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Red Badge</span></b> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>(<img border="0" width="8" height="8" id="Image 20" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image022.gif" alt="Red badge" name="Image 20" />)</span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Marks projects, folders or packages that contain <i>conflicting</i> files. For packages, this badge applies only to the package itself and not its subpackages. For projects or folders, the badge indicates conflicts within that item, or any of the contained subfolders.</span></p> </td> </tr> </table> <p class="MsoNormal" style='line-height:normal'><a name= "color-coding-table" id="color-coding-table"></a><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Color coding is applied to file names in order to indicate their current status against the repository:</span></p> <table class="MsoNormalTable" border="0" cellpadding="0"> <tr> <td width="40" style= 'width:30.0pt;padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Color</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Example</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Description</span></b></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>No specific color (black)</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="75" height="19" id="Image 21" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image023.jpg" alt="Black text" name="Image 21" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Indicates that the file has no changes.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Blue</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="88" height="19" id="Image 22" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image024.gif" alt="Blue text" name="Image 22" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Indicates that the file has been locally modified.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Green</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="88" height="19" id="Image 23" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image025.gif" alt="Green text" name="Image 23" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Indicates that the file has been locally added.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Red</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="88" height="19" id="Image 24" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image026.gif" alt="Red text" name="Image 24" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Indicates that the file is in a merge conflict.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Gray</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="88" height="19" id="Image 25" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image027.gif" alt="Gray text" name="Image 25" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Indicates that the file is ignored by Git and will not be included in versioning commands (e.g. Update and Commit). Files cannot be ignored if they are versioned.</span></p> </td> </tr> </table> <p class="MsoNormal" style='line-height:normal'><a name= "fileStatus" id="fileStatus"></a><b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>File Status Labels</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>The IDE displays two status values for a file:</span></p> <ul type="disc"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>A status describing differences between the files Working Tree and Index state,</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>A status describing differences between the files Index state and current HEAD commit.</span></li> </ul> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>File status labels provide a textual indication of the status of versioned files in the IDE's windows:</span></p> <table class="MsoNormalTable" border="0" cellpadding="0"> <tr> <td width="90" style= 'width:67.5pt;padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Status Label</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Meaning</span></b></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>-</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Unmodified</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>A</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Added</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>U</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Updated but unmerged</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>M</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Modified</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>D</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Deleted</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>I</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Ignored</span></p> </td> </tr> <tr> <td width="120" style= 'width:90.0pt;padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>R</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Renamed</span></p> </td> </tr> </table> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>By default, the IDE displays status (new, modified, ignored, etc.) and folder information in gray text to the right of files, as they are listed in windows.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><img border="0" width="223" height="56" id="Image 26" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image028.jpg" alt="File labels displayed next to file names" name= "Image 26" /></span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>File(s) in merge conflict feature the unmerged status that is generally annotated by red color until the file(s) is not resolved by your explicit action. The status label for unmerged file(s) depends on the scenario (e.g.,</span> <span style= 'font-size:10.0pt;font-family: "Courier New"'>A/A</span><span style='font-size:12.0pt;font-family:"Times New Roman",serif'>- unmerged, both added).</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>File status labels can be toggled on and off by choosing</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>View</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>></span> <span style='font-size:10.0pt;font-family:"Courier New"'>Show Versioning Labels</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>from the main menu.</span></p> <p class="MsoNormal" style='line-height:normal'><a name= "versioningView" id="versioningView"></a><b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Git Versioning View</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>The Git Versioning view provides you with a real-time list of all of the changes made to files within a selected folder of your local working tree. It opens by default in the bottom panel of the IDE, listing added, deleted or modified files.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To open the Versioning view, select a versioned file or folder (e.g. from the Projects, Files, or Favorites window) and either choose</span> <span style='font-size:10.0pt;font-family:"Courier New"'>Git</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>></span> <span style='font-size:10.0pt;font-family:"Courier New"'>Show Changes</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>from the right-click menu, or choose</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Team</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>></span> <span style='font-size:10.0pt;font-family:"Courier New"'>Show Changes</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>from the main menu. The following window appears in the bottom of the IDE:</span></p> <p class="MsoNormal" style='line-height:normal'><a href= "https://netbeans.org/images_www/articles/74/ide/git/versioning-view.png" title= ""Versioning view displaying changes between HEAD and working tree" "> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif;text-decoration: none'> <img border="0" width="500" height="84" id="Image 27" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image029.jpg" alt= "Versioning view displaying changes between HEAD and working tree" name="Image 27" /></span></a></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>By default, the Versioning view displays a list of all modified files within the selected package or folder in your Working Tree. Using the buttons in the toolbar, you can choose to display the list of files which have differences either between Index and HEAD, Working Tree and Index or Working Tree and HEAD. You can also click the column headings above the listed files to sort the files by name, status or location.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>The Versioning view toolbar also includes buttons that enable you to invoke the most common Git tasks on all files displayed in the list. The following table lists the Git commands available in the toolbar of the Versioning view:</span></p> <table class="MsoNormalTable" border="0" cellpadding="0"> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Icon</span></b></p> </td> <td width="110" style= 'width:82.5pt;padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Name</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Function</span></b></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="22" height="22" id="Image 28" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image030.jpg" alt="Changes between HEAD and Working Tree icon" name= "Image 28" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Changes between HEAD and Working Tree</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays a list of files that are either already staged or only modified/created and not staged yet.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="22" height="22" id="Image 29" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image031.jpg" alt="Changes between HEAD and Index icon" name= "Image 29" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Changes between HEAD and Index</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays a list of files that are staged.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="22" height="21" id="Image 30" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image032.jpg" alt="Changes between Index and Working Tree icon" name= "Image 30" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Changes between Index and Working Tree</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays files that have differences between their staged and Working Tree states.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="21" height="21" id="Image 31" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image033.jpg" alt="Refresh Statuses icon" name="Image 31" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Refresh Statuses</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Refreshes the status of the selected files and folders. Files displayed in the Versioning view can be refreshed to reflect any changes that may have been made externally.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="19" height="20" id="Image 32" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image034.jpg" alt="Open Diff icon" name="Image 32" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Open Diff</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Opens the Diff Viewer providing you with a side-by-side comparison of your local copies and the versions maintained in the repository.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="22" height="23" id="Image 33" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image035.jpg" alt="Checkout Paths icon" name="Image 33" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Revert Modifications</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays the <a href= "https://netbeans.org/kb/docs/ide/git.html#revertdialog">Revert Modifications</a> dialog box.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="16" height="20" id="Image 34" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image036.jpg" alt="Commit Changes icon" name="Image 34" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Commit Changes</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays the <a href= "https://netbeans.org/kb/docs/ide/git.html#commitdialog">Commit</a> dialog box.</span></p> </td> </tr> </table> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>You can access other Git commands in the Versioning view by selecting a table row that corresponds to a modified file, and choosing a command from the right-click menu:</span></p> <p class="MsoNormal" style='line-height:normal'><a href= "https://netbeans.org/images_www/articles/74/ide/git/versioning-right-click.png" title= ""Right-click menu displayed on selected file in Versioning window" "> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif;text-decoration: none'> <img border="0" width="300" height="114" id="Image 35" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image037.jpg" alt= "Right-click menu displayed on selected file in Versioning window" name="Image 35" /></span></a></p> <p class="MsoNormal" style='line-height:normal'><a name="diff" id= "diff"></a><b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'>Comparing File Revisions</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Comparing file versions is a common task when working with versioned projects. The IDE enables you to compare revisions by using the Diff command:</span></p> <p class="MsoNormal" style='line-height:normal'><b><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Note:</span></b> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>Several comparing modes - Diff To HEAD, Diff To Tracked, and Diff To - are available in the IDE.</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Select a versioned file or folder (e.g. from the</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Projects</span><span style='font-size:12.0pt;font-family:"Times New Roman",serif'>,</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Files</span><span style='font-size:12.0pt;font-family:"Times New Roman",serif'>, or</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Favorites</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>window).</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Choose</span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Team</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>></span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Diff</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>></span> <span style='font-size: 10.0pt;font-family:"Courier New"'>Diff to HEAD</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>from the main menu.<br /> A graphical Diff Viewer opens for the selected file(s) and revisions in the IDE's main window. The Diff Viewer displays two copies in side-by-side panels. The more current copy appears on the right side, so if you are comparing a repository revision against your working tree, the working tree displays in the right panel:</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/diff-viewer.png" title=""Diff Viewer" "><span style= 'font-size:12.0pt;font-family: "Times New Roman",serif;text-decoration:none'> <img border="0" width="300" height="187" id="Image 36" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image038.jpg" alt="Diff Viewer" name="Image 36" /></span></a></p> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>The Diff Viewer makes use of the same <a href= "https://netbeans.org/kb/docs/ide/git.html#color-coding-table">color coding</a> used elsewhere to display version control changes. In the screen capture displayed above, the green block indicates content that has been added to the more current revision. The red block indicates that content from the earlier revision has been removed from the later. Blue indicates that changes have occurred within the highlighted line(s).</span></p> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Note:</span></b> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Other revisions can be selected from the</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Diff</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>and</span> <span style='font-size:10.0pt;font-family:"Courier New"'>to</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>drop-down lists below the Diff Viewer toolbar.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>The Diff Viewer toolbar also includes buttons that enable you to invoke the most common Git tasks on all files displayed in the list. The following table lists the Git commands available in the toolbar of the Diff Viewer:</span></p> <table class="MsoNormalTable" border="0" cellpadding="0"> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Icon</span></b></p> </td> <td width="130" style= 'width:97.5pt;padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Name</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Function</span></b></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="22" height="22" id="Image 37" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image030.jpg" alt="Changes between HEAD and Working Tree icon" name= "Image 37" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Changes between HEAD and Working Tree</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays a list of files that are either already staged or only modified/created and not staged yet.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="22" height="22" id="Image 38" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image031.jpg" alt="Changes between HEAD and Index icon" name= "Image 38" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Changes between HEAD and Index</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays a list of files that are staged.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="22" height="21" id="Image 39" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image032.jpg" alt="Changes between Index and Working Tree icon" name= "Image 39" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Changes between Index and Working Tree</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays files that have differences between their staged and working tree states.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="22" height="21" id="Image 40" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image039.jpg" alt="Go to Next Difference icon" name="Image 40" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Go to Next Difference</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays next difference in the file.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="21" height="21" id="Image 41" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image040.jpg" alt="Go to Previous Difference icon" name="Image 41" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Go to Previous Difference</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays previous difference in the file.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="21" height="21" id="Image 42" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image041.jpg" alt="Refresh Statuses icon" name="Image 42" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Refresh Statuses</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Refreshes the status of the selected files and folders. Files displayed in the Versioning window can be refreshed to reflect any changes that may have been made externally.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="22" height="23" id="Image 43" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image042.jpg" alt="Checkout Paths icon" name="Image 43" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Revert Modifications</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays the <a href= "https://netbeans.org/kb/docs/ide/git.html#revertdialog">Revert Modifications</a> dialog box.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="16" height="20" id="Image 44" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image043.jpg" alt="Commit Changes icon" name="Image 44" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Commit Changes</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays the <a href= "https://netbeans.org/kb/docs/ide/git.html#commitdialog">Commit</a> dialog box.</span></p> </td> </tr> </table> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>If you are performing a diff on your local copy in the Working Tree, the IDE enables you to make changes directly from within the Diff Viewer. To do so, you can either place your cursor within the right pane of the Diff Viewer and modify your file accordingly, otherwise make use of the inline icons that display adjacent to each highlighted change:</span></p> <table class="MsoNormalTable" border="0" cellpadding="0"> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Icon</span></b></p> </td> <td width="60" style= 'width:45.0pt;padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Name</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Function</span></b></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="16" height="12" id="Image 45" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image044.gif" alt="Replace icon" name="Image 45" /></span></p> </td> <td width="80" style= 'width:60.0pt;padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Replace</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Inserts the highlighted text into your Working Tree copy.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="16" height="12" id="Image 46" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image045.gif" alt="Move all icon" name="Image 46" /></span></p> </td> <td width="120" style= 'width:90.0pt;padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Move All</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Reverts the whole local Working Tree copy.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="16" height="12" id="Image 47" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image046.gif" alt="Remove icon" name="Image 47" /></span></p> </td> <td width="120" style= 'width:90.0pt;padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Remove</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Removes the highlighted text from the local Working Tree copy.</span></p> </td> </tr> </table> <p class="MsoNormal" style='line-height:normal'><a name="revert" id="revert"></a><b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'> </span></b></p> <b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'><br clear= "all" style='page-break-before:always' /></span></b> <p class="MsoNormal" style='line-height:normal'><b><span style= 'font-size:13.5pt; font-family:"Times New Roman",serif'>Reverting Changes</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To throw away local changes made to selected files in your Working Tree and replace those files with the ones in the Index or HEAD:</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Select a versioned file or folder (e.g. from the</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Projects</span><span style='font-size:12.0pt;font-family:"Times New Roman",serif'>,</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Files</span><span style='font-size:12.0pt;font-family:"Times New Roman",serif'>, or</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Favorites</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>window).</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Choose</span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Team</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>></span> <span style='font-size: 10.0pt;font-family:"Courier New"'>Revert Modifications</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>from the main menu.<br /> <a name="revertdialog" id="revertdialog"></a>The</span> <span style='font-size:10.0pt; font-family:"Courier New"'>Revert Modifications</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>dialog box displays.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="397" height="241" id="Image 48" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image047.jpg" alt="Revert Modifications Dialog Box" name="Image 48" /></span></p> <ol start="3" type="1"> <li class="MsoNormal" style='line-height:normal'><a name="three" id="three"></a><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Specify additional options (e.g.,</span> <span style= 'font-size:10.0pt;font-family: "Courier New"'>Revert only Uncommitted Changes in Index to HEAD</span><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>) .</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Click Revert.</span></li> </ol> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>The IDE replaces the selected files with those specified in <a href= "https://netbeans.org/kb/docs/ide/git.html#three">step 3</a> above.</span></p> <b><span style= 'font-size:18.0pt;font-family:"Times New Roman",serif'><br clear= "all" style='page-break-before:always' /></span></b> <p class="MsoNormal" style='line-height:normal'><a name= "committing" id="committing"></a><b><span style= 'font-size:18.0pt;font-family:"Times New Roman",serif'>Committing Sources to a Repository</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To commit files to the Git repository:</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the</span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Projects</span> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>window, right-click the file(s) you want to commit.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the context menu, choose</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Git</span> <span style='font-size:12.0pt;font-family:"Times New Roman",serif'>></span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Commit</span><span style='font-size:12.0pt;font-family:"Times New Roman",serif'>.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a name="commitdialog" id="commitdialog"></a><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>The</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Commit</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>dialog box displays.</span></p> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/commit.png" title=""Commit dialog box" "><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif;text-decoration:none'> <img border="0" width="500" height="383" id="Image 49" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image048.jpg" alt="Commit dialog box" name="Image 49" /></span></a></p> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>The</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Commit</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>dialog box contains the following components:</span></p> <div style="margin-left: 2em" start="2" type="1"> <ul type="circle"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:10.0pt; font-family:"Courier New"'>Commit Message</span> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>text area intended for describing the change being committed</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:10.0pt; font-family:"Courier New"'>Author</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>and</span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Commiter</span> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>drop-down lists that allow to differentiate between those who made the change and who physically committed the file if necessary.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:10.0pt; font-family:"Courier New"'>Files to Commit</span> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>section that lists:</span></li> <li style="list-style: none; display: inline"> <ul type="square"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>all files modified,</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>all files that have been deleted in the Working Tree (locally),</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>all new files (i.e. files that do not yet exist in the Git repository),</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>all files that you have renamed.</span></li> </ul> </li> </ul> </div> <p class="MsoNormal" style= 'margin-left:108.0pt;line-height:normal'><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Two toggle buttons that switch the mode in which the actual commit is to be performed are available here:</span></p> <table class="MsoNormalTable" border="0" cellpadding="0" style= 'margin-left:108.0pt'> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>UI Component</span></b></p> </td> <td width="300" style= 'width:225.0pt;padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Name</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" align="center" style= 'margin-bottom:0cm;text-align:center; line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Description</span></b></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="22" height="22" id="Image 50" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image031.jpg" alt="Changes between HEAD and Index" name="Image 50" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Changes between HEAD and Index</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays a list of files that are staged.</span></p> </td> </tr> <tr> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><img border= "0" width="22" height="22" id="Image 51" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image030.jpg" alt="Changes between HEAD and Working Tree" name= "Image 51" /></span></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Changes between HEAD and Working Tree</span></b></p> </td> <td style='padding:.75pt .75pt .75pt .75pt'> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Displays a list of files that are either already staged or only modified/created and not staged yet.</span></p> </td> </tr> </table> <div style="margin-left: 2em" start="2" type="1"> <ul type="circle"> <li class="MsoNormal" style='line-height:normal'><b><span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>Note</span></b><span style='font-size:12.0pt;font-family:"Times New Roman",serif'>: To specify here whether to exclude individual files from the commit, either deselect the checkbox in the first column called</span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Commit</span> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>or right-click a file row in the</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Commit Action</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>column and choose</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Exclude from commit</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>from the pop-up menu. To display the Diff Viewer here, right-click a file row in the</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Commit Action</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>column and choose</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Diff</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>from the pop-up menu.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:10.0pt; font-family:"Courier New"'>Update Issue</span> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>section intended for tracking issues related to the change being committed.</span></li> </ul> </div> <p class="MsoNormal" style='margin-left:72.0pt;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Note</span></b><span style='font-size:12.0pt;font-family:"Times New Roman",serif'>: You need to install the JIRA or Subversion plugin to start tracking issues in the IDE.</span></p> <ol start="3" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Type in a commit message in the</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Commit Message</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>text area. Alternatively, you can do any of the following:</span> <ul type="circle"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>click the</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Recent Messages</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>( <img border="0" width="18" height="20" id="Image 52" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image049.jpg" alt="Recent messages icon" name="Image 52" />) icon located in the upper right corner to view and select from a list of messages that you have previously used,</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>click the</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Load Template</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>(<img border="0" width="18" height="18" id="Image 53" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image050.jpg" alt="Select template icon" name="Image 53" />) icon located in the upper right corner to select a message template.</span></li> </ul> </li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>After specifying actions for individual files, click</span> <span style= 'font-size:10.0pt;font-family: "Courier New"'>Commit</span><span style='font-size:12.0pt;font-family: "Times New Roman",serif'>.<br /> The IDE executes the commit and stores your snapshots to the repository. The IDE's status bar, located in the bottom right of the interface, displays as the commit action takes place. Upon a successful commit, versioning badges disappear in the</span> <span style= 'font-size:10.0pt; font-family:"Courier New"'>Projects</span><span style='font-size:12.0pt; font-family:"Times New Roman",serif'>,</span> <span style= 'font-size:10.0pt; font-family:"Courier New"'>Files</span> <span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>and</span> <span style= 'font-size: 10.0pt;font-family:"Courier New"'>Favorites</span> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>windows, and the color coding of committed files returns to black.</span></li> </ol> <b><span style= 'font-size:18.0pt;font-family:"Times New Roman",serif'><br clear= "all" style='page-break-before:always' /></span></b> <p class="MsoNormal" style='line-height:normal'><a name="branch" id="branch"></a><b><span style= 'font-size:18.0pt;font-family:"Times New Roman",serif'>Working with Branches</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>The IDE's Git support enables you to maintain different versions of an entire code base using branches.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>When working with branches in the IDE, the following actions are supported:</span></p> <ul type="disc"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#branchCreate">Creating</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#branchCheckOut">Checking out</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#branchMerge">Merging</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#branchDelete">Deleting</a></span></li> </ul> <p class="MsoNormal" style='line-height:normal'><a name= "branchCreate" id="branchCreate"></a><b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'>Creating a Branch</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To create a local branch, if you want to work on a separate version of your file system for stabilization or experimentation purposes without disturbing the main trunk, complete the following steps:</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Projects or Files window, choose a project or folder from the repository in which you want to create the branch.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the main menu, choose Team > Branch/Tag > Create Branch.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Note:</span></b> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>As an alternative right-click the versioned project or folder and choose Git > Branch/Tag > Create Branch in the popup menu.</span></p> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>The Create Branch dialog box displays.</span></p> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/create-branch.png" title=""Create Branch dialog box" "><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif;text-decoration:none'> <img border="0" width="300" height="219" id="Image 54" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image051.jpg" alt="Create Branch dialog box" name="Image 54" /></span></a></p> <ol start="3" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Branch Name field, enter the name of the branch being created.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Type a specific revision of the selected item by entering a commit ID, existing branch, or tag name in the Revision field or press Select to view the list of revisions maintained in the repository.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>(Optional) In the Select Revision dialog box, expand Branches and choose the branch required, specify the commit ID in the adjacent list, and press Select.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Review the Commit ID, Author, Message fields information specific to the revision being branched from and click Create.<br /> The branch is added to the</span> <span style= 'font-size:10.0pt; font-family:"Courier New"'>Branches/Local</span> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>folder of the Git repository.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/branch-added.png" title= ""Git Repository: New branch created" "><span style='font-size: 12.0pt;font-family:"Times New Roman",serif;text-decoration:none'> <img border="0" width="300" height="118" id="Image 55" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image052.jpg" alt="Branch added" name="Image 55" /></span></a></p> <p class="MsoNormal" style='line-height:normal'><a name= "branchCheckOut" id="branchCheckOut"></a><b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'>Checking Out</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>If you need to edit files on a branch that already exists, you can check out the branch to copy the files to your Working Tree.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To check out a revision, perform the following:</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Choose Team > Checkout > Checkout Revision from the main menu.<br /> The Checkout Selected Revision dialog box displays.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/chkout-rev.png" title=""Checkout Selected Revision" "><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif;text-decoration:none'> <img border="0" width="300" height="231" id="Image 56" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image053.jpg" alt="Checkout Selected Revision" name="Image 56" /></span></a></p> <ol start="2" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Specify the revision required by entering a commit ID, existing branch, or tag name in the Revision field or press Select to view the list of revisions maintained in the repository.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Skip if you did not press Select in the previous step. In the Select Revision dialog box, expand Branches and choose the branch required, specify the commit ID in the adjacent list if required, and press Select.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Note:</span></b> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>If the specified revision refers to a valid commit that is not marked with a branch name, your HEAD becomes detached and you are no longer on any branch.</span></p> <ol start="4" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Review the Commit ID, Author, Message fields information specific to the revision being checked out.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To create a new branch out of the checked out revision, choose the Checkout as New Branch option and enter the name in the Branch Name field.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Press Checkout to check out revision.<br /> Files in the Working Tree and in the Index are updated to match the version in the specified revision.</span></li> </ol> <p class="MsoNormal" style='line-height:normal'><b><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Note:</span></b> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>If you want to switch your files to a branch that already exists (e.g., to a commit that is not at the top of one of your branches), you can use the Team > Git > Branch > Switch To Branch command, specify the branch in the Switch to Selected Branch dialog box, check it out as a new branch (optionally), and press Switch.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>The IDE supports context-sensitive checkout of the file(s), folder(s), or project(s) currently selected in the IDE. To check out some files (not a branch) from the Index, complete the following steps:</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Choose Team > Checkout > Checkout Files from the main menu.<br /> The Checkout Selected Paths dialog box displays.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/chkout-path.png" title=""Checkout Selected Paths" "><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif;text-decoration:none'> <img border="0" width="300" height="221" id="Image 57" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image054.jpg" alt="Checkout Selected Paths" name="Image 57" /></span></a></p> <ol start="2" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Choose the Update Index with Entries from the Selected Revision option.<br /> If selected, the Index is updated with the state in the selected revision prior to the checkout itself (i.e., the selected files both in the Working Tree and Index are updated).</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Specify the revision required by entering a commit ID, existing branch, or tag name in the Revision field or press Select to view the list of revisions maintained in the repository.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Skip if you did not press Select in the previous step. In the Select Revision dialog box, expand Branches and choose the branch required, specify the revision number in the adjacent list if required, and press Select.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Press Checkout to complete the checkout.</span></li> </ol> <b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'><br clear= "all" style='page-break-before:always' /></span></b> <p class="MsoNormal" style='line-height:normal'><a name= "branchMerge" id="branchMerge"></a><b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'>Merging</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To port modifications from a repository revision to the Working Tree, do as follows:</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Choose Team > Branch/Tag > Merge Revision from the main menu.<br /> The Merge Revision dialog box displays.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/merge.png" title=""Merge Revision" "><span style= 'font-size:12.0pt;font-family: "Times New Roman",serif;text-decoration:none'> <img border="0" width="277" height="211" id="Image 58" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image055.jpg" alt="Merge Revision" name="Image 58" /></span></a></p> <ol start="2" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Specify the revision required by entering a commit ID, existing branch, or tag name in the Revision field or press Select to view the list of revisions maintained in the repository.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Skip if you did not press Select in the previous step. In the Select Revision dialog box, expand Branches and choose the branch required, specify the commit ID in the adjacent list if required, and press Select.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Press Merge.<br /> A three-way merge between the current branch, your Working Tree contents, and the specified branch is done.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Note:</span></b> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>If a merge conflict occurs, the conflicting file is marked with <a href= "https://netbeans.org/kb/docs/ide/git.html#badges">a red badge</a> to indicate this.</span></p> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <b><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Note:</span></b> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>After merging you must still <a href= "https://netbeans.org/kb/docs/ide/git.html#committing">commit</a> the changes in order for them to be added to the HEAD.</span></p> <p class="MsoNormal" style='line-height:normal'><a name= "branchDelete" id="branchDelete"></a><b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'>Deleting a Branch</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To delete an unnecessary local branch, complete the following steps:</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Choose Team > Repository Browser from the main menu.</span></li> </ol> <p class="MsoNormal" style= 'margin-bottom:3.0pt;margin-left:35.7pt;text-indent: -17.85pt;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>2.<span style='font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>In the Git Repository Browser, choose the branch to be deleted.</span></p> <p class="MsoNormal" style= 'margin-top:0cm;margin-right:-14.2pt;margin-bottom: 0cm;margin-left:36.0pt;line-height:normal'> <b><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Note:</span></b> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>The branch must be inactive, i.e. not currently checked out into the Working Tree.</span></p> <p class="MsoNormal" style= 'margin-top:6.0pt;margin-left:35.7pt;text-indent:-17.85pt; line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>3.<span style='font:7.0pt "Times New Roman"'> </span></span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>Right-click the selected branch and choose Delete Branch from the popup menu.</span></p> <ol start="4" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>In the Delete Branch dialog box, press OK to confirm the branch deletion.<br /> The branch is removed from the local repository as well as the Git Repository Browser.</span></li> </ol> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'><br clear= "all" style='page-break-before:always' /></span> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'> </span></p> <p class="MsoNormal" style='line-height:normal'><a name="remote" id="remote"></a><b><span style= 'font-size:18.0pt;font-family:"Times New Roman",serif'>Working with Remote Repositories</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>When you work with other developers you need to share your work, which involves fetching, pushing, and pulling data to and from remote repositories hosted on the Internet or network.</span></p> <ul type="disc"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#fetch">Fetching</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#pull">Pulling</a></span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'><a href= "https://netbeans.org/kb/docs/ide/git.html#push">Pushing</a></span></li> </ul> <p class="MsoNormal" style='line-height:normal'><a name="fetch" id= "fetch"></a><b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'>Fetching</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Fetching gets the changes from the original remote repository that you do not have yet. It never changes any of your local branches. Fetching gets all the branches from remote repositories, which you can merge into your branch or just inspect at any time.</span></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To fetch the updates, do as follows:</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Choose Team > Remote > Fetch.<br /> The Fetch from Remote Repository wizard displays.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/fetch.png" title= ""Fetch from Remote Repository wizard" "><span style= 'font-size:12.0pt;font-family:"Times New Roman",serif;text-decoration: none'> <img border="0" width="350" height="153" id="Image 59" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image056.jpg" alt="Fetch from Remote Repository wizard" name= "Image 59" /></span></a></p> <ol start="2" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>At the Remote Repository page of the wizard, select either the Configured repository (to use the path to the repository configured earlier) or Specify Git Repository Location option (to define the path to a remote repository that has not been accessed yet, its name, login, password, and proxy configuration if required) and click Next.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>At the Remote Branches page of the wizard, choose the branches to fetch changes from and click Finish.<br /> A local copy of a remote branch is created. The selected branch are updated in the</span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Branches</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>></span> <span style= 'font-size:10.0pt;font-family:"Courier New"'>Remote</span> <span style= 'font-size:12.0pt;font-family:"Times New Roman",serif'>directory in the Git Repository Browser.<br /> Next the fetched updates can be merged into a local branch.</span></li> </ol> <b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'><br clear= "all" style='page-break-before:always' /></span></b> <p class="MsoNormal" style='line-height:normal'><a name="pull" id= "pull"></a><b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'>Pulling</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>When pulling some updates from a remote Git repository, the changes are fetched from it and merged into the current HEAD of your local repository.<br /> To perform pulling, complete the following steps:</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Choose Team > Remote > Pull.<br /> The Pull from Remote Repository wizard displays.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/pull.png" title= ""Pull from Remote Repository wizard" "><span style='font-size: 12.0pt;font-family:"Times New Roman",serif;text-decoration:none'> <img border="0" width="350" height="231" id="Image 60" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image057.jpg" alt="Pull from Remote Repository wizard" name= "Image 60" /></span></a></p> <ol start="2" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>At the Remote Repository page of the wizard, select either the Configured repository (to use the path to the repository configured earlier) or Specify Git Repository Location option (to define the path to a remote repository that has not been accessed yet, its name, and login and password if required) and click Next.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>At the Remote Branches page of the wizard, choose the branches to be pulled changes from and click Finish.<br /> Your local repository is synchronized with the origin repository.</span></li> </ol> <p class="MsoNormal" style='line-height:normal'><a name="push" id= "push"></a><b><span style= 'font-size:13.5pt;font-family:"Times New Roman",serif'>Pushing</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>To contribute changes from your local Git repository into a public Git repository, perform the following steps:</span></p> <p class="MsoNormal" style='line-height:normal'><b><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Note:</span></b> <span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif'>When you are going to push your commits into a repository and some other changes have been pushed in the meantime, you need to pull and merge those changes first.</span></p> <ol start="1" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>Choose Team > Remote > Push.<br /> The Push to Remote Repository wizard displays.</span></li> </ol> <p class="MsoNormal" style='margin-left:36.0pt;line-height:normal'> <a href= "https://netbeans.org/images_www/articles/74/ide/git/push.png" title=""Push to Remote Repository wizard" "><span style= 'font-size: 12.0pt;font-family:"Times New Roman",serif;text-decoration:none'> <img border="0" width="350" height="188" id="Image 61" src= "UtilisationCdesDeBaseGit_SousNetBeans_Plus_TutoCompletEnAnglais_fichiers/image058.jpg" alt="Push to Remote Repository wizard" name= "Image 61" /></span></a></p> <ol start="2" type="1"> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>At the Remote Repository page of the wizard, select either the Configured repository (to use the path to the repository configured earlier) or Specify Git Repository Location option (to define the path to a remote repository that has not been accessed yet, its name, and login and password if required) and click Next.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>At the Select Local Branches page, choose the branch(es) to push your edits to and click Next.</span></li> <li class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>At the Update Local References page, choose the branch(es) to be updated in the Remotes directory of your local repository and click Finish.<br /> The specified remote repository branch is updated with the latest state of your local branch.</span></li> </ol> <p class="MsoNormal" style='line-height:normal'><a name="summary" id="summary"></a><b><span style= 'font-size:18.0pt;font-family:"Times New Roman",serif'>Summary</span></b></p> <p class="MsoNormal" style='line-height:normal'><span style= 'font-size:12.0pt; font-family:"Times New Roman",serif'>This tutorial showed how to perform basic versioning tasks in the IDE by guiding you through the standard workflow when using the IDE's GIT support. It demonstrated how to set up a versioned project and perform basic tasks on versioned files while introducing you to some of the GIT specific features included in the IDE.</span></p> <p class="MsoNormal"> </p> <p class="MsoNormal" style='margin-bottom:0cm;line-height:normal'> <span style='font-family:"Times New Roman",serif'> </span></p> </div>
Table des matières
Sujets
Recherche
Help content
Help content
Générée avec
chmProcessor
Générée avec
chmProcessor