{"id":7834,"date":"2021-06-23T00:00:00","date_gmt":"2021-06-22T22:00:00","guid":{"rendered":"https:\/\/blog.ouidou.fr\/?p=7834"},"modified":"2024-09-02T16:16:47","modified_gmt":"2024-09-02T14:16:47","slug":"quatres-astuces-pour-maitriser-ses-rebases","status":"publish","type":"post","link":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases","title":{"rendered":"Quatres astuces pour maitriser ses rebases"},"content":{"rendered":"<p><em>Article \u00e9crit par Eddie Barraco<\/em><\/p>\n<p>Lorsqu\u2019on est \u00e0 l\u2019aise avec Git, il est courant d\u2019user et d\u2019abuser du rebase interactif.<\/p>\n<p>Pour rappel, <code>git rebase -i ACOMMIT<\/code> vas nous permettre d\u2019\u00e9diter, renommer, fusionner vos commits. Il devient rapidement l\u2019outil principal des d\u00e9veloppeurs une fois pris en main. Cependant il est \u00e9galement la b\u00eate noire qui risque de r\u00e9duire \u00e0 n\u00e9ant notre travail.<\/p>\n<p>Voici quelques astuces pour nous rendre plus confiant lors de nos rebases.<\/p>\n<h2 id=\"comment-rsoudre-efficacement-un-conflit\">Comment r\u00e9soudre efficacement un conflit<\/h2>\n<p>Avant toute chose, nous devons absolument changer une configuration Git. Ajoutons ceci dans notre <code>~\/.gitconfig<\/code> si ce n\u2019est pas d\u00e9j\u00e0 fait.<\/p>\n<pre><code>[merge] conflictstyle = diff3 <\/code><\/pre>\n<p>Ce style de conflit va beaucoup nous aider et devrait selon moi \u00eatre ainsi par d\u00e9faut. En cas de conflit, voici ce que nous verrons&nbsp;:<\/p>\n<div class=\"language-diff highlighter-rouge\">\n<div class=\"highlight\">\n<pre class=\"highlight\"><code><span class=\"gd\">&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD <\/span><span class=\"p\">THIS IS USEFUL <\/span><span class=\"err\">|||||||<\/span> merged common ancestors <span class=\"p\">This is useful <\/span><span class=\"gh\">======= <\/span><span class=\"p\">This is really useful <\/span><span class=\"gi\">&gt;&gt;&gt;&gt;&gt;&gt;&gt; c2392943..... <\/span><\/code><\/pre>\n<\/div>\n<\/div>\n<p>Lorsque nous rencontrons ceci&nbsp;:<\/p>\n<ul>\n<li>Tout d\u2019abord, localisons lequel du <code>HEAD<\/code> ou du <code>c2392943<\/code> est notre changement, celui qui est de notre c\u00f4t\u00e9.<\/li>\n<li>Ensuite, nous devons comprendre ce que l\u2019autre c\u00f4t\u00e9 a apport\u00e9 par rapport \u00e0 la partie centrale.<\/li>\n<li>Maintenant, nous devons reporter cette \u00e9volution de notre c\u00f4t\u00e9 si c\u2019est toujours n\u00e9cessaire&nbsp;!<\/li>\n<li>Supprimons tout le reste<\/li>\n<\/ul>\n<p>Concr\u00e8tement&nbsp;:<\/p>\n<ul>\n<li>J\u2019ai pass\u00e9 le texte en majuscule<\/li>\n<li>L\u2019autre c\u00f4t\u00e9 a ajout\u00e9 le mot \u00abreally\u00bb<\/li>\n<li>Je dois donc ajouter \u00abREALLY\u00bb de mon c\u00f4t\u00e9<\/li>\n<li>Je nettoie le reste<\/li>\n<\/ul>\n<div class=\"language-diff highlighter-rouge\">\n<div class=\"highlight\">\n<pre class=\"highlight\"><code><span class=\"p\">THIS IS REALLY USEFUL <\/span><\/code><\/pre>\n<\/div>\n<\/div>\n<h2 id=\"attachons-notre-git-hook\">Attachons notre Git hook<\/h2>\n<p>Il est commun de devoir g\u00e9rer des conflits lorsque on fait des rebases (ou tout autre manipulation Git d\u2019ailleurs&nbsp;!). Je nous propose ici d\u2019installer une ceinture de s\u00e9curit\u00e9 qui va nous emp\u00eacher de passer \u00e0 travers le pare-brise au premier d\u00e9rapage.<\/p>\n<p>L\u2019id\u00e9e est d\u2019\u00eatre inform\u00e9 si nous avons modifi\u00e9 quelque chose lors de notre gestion du conflit.<\/p>\n<p>Une petite vid\u00e9o vaut mieux que toutes les explications&nbsp;?<\/p>\n<p><iframe loading=\"lazy\" width=\"560\" height=\"315\" sandbox=\"allow-same-origin allow-scripts allow-popups\" src=\"https:\/\/tube.missbanal.net\/videos\/embed\/ee9ad4bf-2f66-401f-b8c5-96f0f182b709\" frameborder=\"0\" allowfullscreen=\"\"><\/iframe><\/p>\n<p>Ajoutons ces deux scripts dans notre dossier <code>.git\/hooks<\/code> avec les droits d\u2019ex\u00e9cution. On peut \u00e9galement les ajouter globalement gr\u00e2ce \u00e0 <code>~\/.gitconfig<\/code> ainsi&nbsp;:<\/p>\n<pre><code>[init] templatedir = ~\/.gitconfig.d\/template <\/code><\/pre>\n<p>Notons que cela n\u2019impactera pas les repos Git existant&nbsp;!<\/p>\n<p>Ajoutons-les ensuite dans ce dossier <code>~\/.gitconfig.d\/template\/hooks\/<\/code><\/p>\n<p>Fichier <code>pre-rebase<\/code>&nbsp;:<\/p>\n<div class=\"language-sh highlighter-rouge\">\n<div class=\"highlight\">\n<pre class=\"highlight\"><code><span class=\"c\">#!\/usr\/bin\/env sh<\/span>  <span class=\"nb\">export <\/span><span class=\"nv\">GIT_DIR<\/span><span class=\"o\">=<\/span><span class=\"s2\">\"<\/span><span class=\"si\">$(<\/span>git rev-parse <span class=\"nt\">--absolute-git-dir<\/span><span class=\"si\">)<\/span><span class=\"s2\">\"<\/span> <span class=\"nv\">rebase_in_progress_file<\/span><span class=\"o\">=<\/span><span class=\"s2\">\"<\/span><span class=\"nv\">$GIT_DIR<\/span><span class=\"s2\">\/rebase_in_progress\"<\/span>  git rev-parse HEAD <span class=\"o\">&gt;<\/span> <span class=\"s2\">\"<\/span><span class=\"nv\">$rebase_in_progress_file<\/span><span class=\"s2\">\"<\/span> <\/code><\/pre>\n<\/div>\n<\/div>\n<p>Celui-ci vraiment simple. On stocke la r\u00e9f\u00e9rence Git au d\u00e9part d\u2019une r\u00e9\u00e9criture.<\/p>\n<p>Fichier <code>post-rewrite<\/code>&nbsp;:<\/p>\n<div class=\"language-sh highlighter-rouge\">\n<div class=\"highlight\">\n<pre class=\"highlight\"><code><span class=\"c\">#!\/usr\/bin\/env sh<\/span>  <span class=\"nb\">export <\/span><span class=\"nv\">GIT_DIR<\/span><span class=\"o\">=<\/span><span class=\"s2\">\"<\/span><span class=\"si\">$(<\/span>git rev-parse <span class=\"nt\">--absolute-git-dir<\/span><span class=\"si\">)<\/span><span class=\"s2\">\"<\/span> <span class=\"nv\">rebase_in_progress_file<\/span><span class=\"o\">=<\/span><span class=\"s2\">\"<\/span><span class=\"nv\">$GIT_DIR<\/span><span class=\"s2\">\/rebase_in_progress\"<\/span>  confirm_rebase_diff<span class=\"o\">()<\/span> <span class=\"o\">{<\/span> \t<span class=\"nv\">old_ref<\/span><span class=\"o\">=<\/span><span class=\"s2\">\"<\/span><span class=\"nv\">$1<\/span><span class=\"s2\">\"<\/span> \t<span class=\"nv\">new_ref<\/span><span class=\"o\">=<\/span><span class=\"s2\">\"<\/span><span class=\"nv\">$2<\/span><span class=\"s2\">\"<\/span>  \t<span class=\"k\">if<\/span> <span class=\"o\">[<\/span> <span class=\"nt\">-z<\/span> <span class=\"s2\">\"<\/span><span class=\"si\">$(<\/span>git diff <span class=\"s2\">\"<\/span><span class=\"nv\">$old_ref<\/span><span class=\"s2\">..<\/span><span class=\"nv\">$new_ref<\/span><span class=\"s2\">\"<\/span><span class=\"si\">)<\/span><span class=\"s2\">\"<\/span> <span class=\"o\">]<\/span><span class=\"p\">;<\/span> <span class=\"k\">then \t\t<\/span><span class=\"nb\">printf<\/span> <span class=\"s2\">\"%s<\/span><span class=\"se\">n<\/span><span class=\"s2\">\"<\/span> <span class=\"s2\">\"Your rebase caused no code changes, good for you\"<\/span> <span class=\"o\">&gt;<\/span>&amp;2 \t\t<span class=\"k\">return \tfi  \t<\/span><span class=\"nb\">printf<\/span> <span class=\"s2\">\"%s<\/span><span class=\"se\">n<\/span><span class=\"s2\">\"<\/span> <span class=\"s2\">\"Your rebase resulted in code changes\"<\/span> <span class=\"o\">&gt;<\/span>&amp;2 \tgit diff <span class=\"s2\">\"<\/span><span class=\"nv\">$old_ref<\/span><span class=\"s2\">..<\/span><span class=\"nv\">$new_ref<\/span><span class=\"s2\">\"<\/span> <span class=\"o\">&gt;<\/span>&amp;2  \t<span class=\"nb\">printf<\/span> <span class=\"s2\">\"%s\"<\/span> <span class=\"s2\">\"Do you want to keep the changes? [Y\/n] \"<\/span> <span class=\"o\">&gt;<\/span>&amp;2 \t<span class=\"nb\">read<\/span> <span class=\"nt\">-r<\/span> reply &lt; \/dev\/tty \t<span class=\"k\">if<\/span> <span class=\"o\">[<\/span> <span class=\"nt\">-z<\/span> <span class=\"s2\">\"<\/span><span class=\"nv\">$reply<\/span><span class=\"s2\">\"<\/span> <span class=\"o\">]<\/span> <span class=\"o\">||<\/span> <span class=\"o\">[<\/span> <span class=\"s2\">\"<\/span><span class=\"nv\">$reply<\/span><span class=\"s2\">\"<\/span> <span class=\"o\">=<\/span> <span class=\"s2\">\"y\"<\/span> <span class=\"o\">]<\/span><span class=\"p\">;<\/span> <span class=\"k\">then \t\t<\/span><span class=\"nb\">printf<\/span> <span class=\"s2\">\"%s<\/span><span class=\"se\">n<\/span><span class=\"s2\">\"<\/span> <span class=\"s2\">\"Cool! All changes kept\"<\/span> <span class=\"o\">&gt;<\/span>&amp;2 \t<span class=\"k\">else \t\t<\/span><span class=\"nb\">printf<\/span> <span class=\"s2\">\"%s<\/span><span class=\"se\">nn<\/span><span class=\"s2\">\"<\/span> <span class=\"s2\">\"Discarding changes...\"<\/span> <span class=\"o\">&gt;<\/span>&amp;2 \t\tgit reset <span class=\"nt\">--hard<\/span> <span class=\"s2\">\"<\/span><span class=\"nv\">$old_ref<\/span><span class=\"s2\">\"<\/span> \t<span class=\"k\">fi<\/span> <span class=\"o\">}<\/span>  <span class=\"k\">if<\/span> <span class=\"o\">[<\/span> <span class=\"nt\">-f<\/span> <span class=\"s2\">\"<\/span><span class=\"nv\">$rebase_in_progress_file<\/span><span class=\"s2\">\"<\/span> <span class=\"o\">]<\/span> <span class=\"o\">&amp;&amp;<\/span> <span class=\"o\">[<\/span> <span class=\"s2\">\"<\/span><span class=\"nv\">$1<\/span><span class=\"s2\">\"<\/span> <span class=\"o\">=<\/span> <span class=\"s2\">\"rebase\"<\/span> <span class=\"o\">]<\/span><span class=\"p\">;<\/span> <span class=\"k\">then \t<\/span><span class=\"nv\">old_sha<\/span><span class=\"o\">=<\/span><span class=\"s2\">\"<\/span><span class=\"si\">$(<\/span><span class=\"nb\">cat<\/span> <span class=\"s2\">\"<\/span><span class=\"nv\">$rebase_in_progress_file<\/span><span class=\"s2\">\"<\/span><span class=\"si\">)<\/span><span class=\"s2\">\"<\/span> \tconfirm_rebase_diff <span class=\"s2\">\"<\/span><span class=\"nv\">$old_sha<\/span><span class=\"s2\">\"<\/span> <span class=\"s2\">\"HEAD\"<\/span> \t<span class=\"nb\">rm<\/span> <span class=\"s2\">\"<\/span><span class=\"nv\">$rebase_in_progress_file<\/span><span class=\"s2\">\"<\/span> <span class=\"k\">fi<\/span> <\/code><\/pre>\n<\/div>\n<\/div>\n<p>On vient comparer la diff\u00e9rence entre la r\u00e9f\u00e9rence Git que nous avons pr\u00e9c\u00e9demment stock\u00e9 et celle \u00e0 la fin.<\/p>\n<p>Plusieurs choix s\u2019offrent \u00e0 nous si c\u2019est le cas&nbsp;:<\/p>\n<ul>\n<li>Oui c\u2019est normal&nbsp;: Une m\u00e9thode est pass\u00e9e chronologiquement avant une autre ou bien nous avons d\u00fb adapter une bricole.<\/li>\n<li>Non ce n\u2019est pas ce que je voulais faire&nbsp;: Annule tout Git, je t\u2019en conjure&nbsp;!<\/li>\n<\/ul>\n<p>Si la r\u00e9\u00e9criture n\u2019a engendr\u00e9 aucune diff\u00e9rence dans le code, tant mieux&nbsp;! Rien ne s\u2019affiche et la vie continue<\/p>\n<h2 id=\"git-alaide\">Git alaide<\/h2>\n<p>Vous avez fait une b\u00eatise. Ne mentez pas, je le vois \u00e0 vos yeux horrifi\u00e9s qui scrutent l\u2019open-space. Vous cherchez de l\u2019aide.<\/p>\n<p>Pas de panique. Git int\u00e8gre une m\u00e9canique d\u2019historique (cela ne devrait vraiment pas nous \u00e9tonner).<\/p>\n<div class=\"language-sh highlighter-rouge\">\n<div class=\"highlight\">\n<pre class=\"highlight\"><code><span class=\"nv\">$ <\/span>git reflog <\/code><\/pre>\n<\/div>\n<\/div>\n<p>Git reflog vas nous donner la liste des derni\u00e8res actions qu\u2019il a r\u00e9alis\u00e9es. Ce ne sont que d\u2019autres r\u00e9f\u00e9rences Git vers des \u00e9tats ant\u00e9rieurs. Elles sont sous la forme <code>HEAD@{0}<\/code>.<\/p>\n<p>Si nous avons ravag\u00e9 notre travail \u00e0 cause d\u2019un rebase, cherchons le reflog qui commence par <code>rebase (start)<\/code>. Nous pouvons aussi cibler le reflog de notre pr\u00e9c\u00e9dent commit. Gardons juste en t\u00eate qu\u2019un reflog repr\u00e9sente l\u2019\u00e9tat apr\u00e8s l\u2019action.<\/p>\n<p>Si nous voulons revenir avant le d\u00e9but du rebase dans l\u2019exemple suivant, faisons par exemple&nbsp;:<\/p>\n<div class=\"language-sh highlighter-rouge\">\n<div class=\"highlight\">\n<pre class=\"highlight\"><code><span class=\"nv\">$ <\/span>git reflog 2d0272ac0 <span class=\"o\">(<\/span>HEAD<span class=\"o\">)<\/span> HEAD@<span class=\"o\">{<\/span>0<span class=\"o\">}<\/span>: commit: fix: Add a missing shipping <span class=\"nb\">type <\/span>8fef1ba6d HEAD@<span class=\"o\">{<\/span>1<span class=\"o\">}<\/span>: commit: fix: add a missing technical <span class=\"nb\">link <\/span>between garment listing and its ordered products 6b8df6666 HEAD@<span class=\"o\">{<\/span>2<span class=\"o\">}<\/span>: commit: fix: Add a required index to make Odoo <span class=\"nb\">sync <\/span>faster 54bfc6977 HEAD@<span class=\"o\">{<\/span>3<span class=\"o\">}<\/span>: checkout: moving from feature\/ops to 54bfc6977 fa529fdea HEAD@<span class=\"o\">{<\/span>4<span class=\"o\">}<\/span>: rebase <span class=\"o\">(<\/span><span class=\"k\">continue<\/span><span class=\"o\">)<\/span> <span class=\"o\">(<\/span>finish<span class=\"o\">)<\/span>: returning to refs\/heads\/feature\/ops fa529fdea HEAD@<span class=\"o\">{<\/span>5<span class=\"o\">}<\/span>: rebase <span class=\"o\">(<\/span><span class=\"k\">continue<\/span><span class=\"o\">)<\/span> <span class=\"o\">(<\/span>pick<span class=\"o\">)<\/span>: WIP: feat: odoo <span class=\"nb\">sync <\/span>customer bills ca827f90c HEAD@<span class=\"o\">{<\/span>6<span class=\"o\">}<\/span>: rebase <span class=\"o\">(<\/span><span class=\"k\">continue<\/span><span class=\"o\">)<\/span>: WIP: feat: odoo <span class=\"nb\">sync <\/span>bank account and entities 54bfc6977 HEAD@<span class=\"o\">{<\/span>7<span class=\"o\">}<\/span>: rebase <span class=\"o\">(<\/span><span class=\"k\">continue<\/span><span class=\"o\">)<\/span> <span class=\"o\">(<\/span>pick<span class=\"o\">)<\/span>: feat<span class=\"o\">(<\/span>ops<span class=\"o\">)<\/span>: add ops config eea26d0ed HEAD@<span class=\"o\">{<\/span>8<span class=\"o\">}<\/span>: rebase <span class=\"o\">(<\/span><span class=\"k\">continue<\/span><span class=\"o\">)<\/span>: feat: Odoo add a reset <span class=\"nb\">command <\/span>fe252ae98 HEAD@<span class=\"o\">{<\/span>9<span class=\"o\">}<\/span>: rebase <span class=\"o\">(<\/span>start<span class=\"o\">)<\/span>: checkout perso\/production ... <span class=\"nv\">$ <\/span>git reset <span class=\"nt\">--hard<\/span> HEAD@<span class=\"o\">{<\/span>9<span class=\"o\">}<\/span>^ <\/code><\/pre>\n<\/div>\n<\/div>\n<p>Au final, nous pourrions tout aussi bien \u00e9crire sur un bout de papier la r\u00e9f\u00e9rence de notre dernier commit <code>avant la catastrophe<\/code> car cela revient au m\u00eame.<\/p>\n<h2 id=\"dans-le-doute-poussez\">Dans le doute, poussez<\/h2>\n<p>Une fois que nous avons travaill\u00e9 vos commits, nous pouvons enfin montrer au monde nos talents d\u2019arboriste.<\/p>\n<p>\u00c9diter l\u2019historique Git nous oblige maintenant \u00e0 pousser nos commits avec force et conviction. Difficile de savoir quelles seront les cons\u00e9quences de l\u2019autre c\u00f4t\u00e9 du r\u00e9seau.<\/p>\n<p>Pourtant Git nous offre un moyen simple d\u2019en d\u00e9terminer les issues.<\/p>\n<div class=\"language-sh highlighter-rouge\">\n<div class=\"highlight\">\n<pre class=\"highlight\"><code><span class=\"nv\">$ <\/span>git push origin HEAD:oopsi\/fixing-typo <span class=\"nt\">-fn<\/span> <\/code><\/pre>\n<\/div>\n<\/div>\n<p>Notons le param\u00e8tre <code>-n<\/code> (\u00abn\u00bb pour dry-run <code>\u00af_(\u30c4)_\/\u00af<\/code>) adoss\u00e9 au <code>-f<\/code>. En r\u00e9ponse \u00e0 cette commande, le <em>repo<\/em> distant va nous donner ceci&nbsp;:<\/p>\n<div class=\"language-sh highlighter-rouge\">\n<div class=\"highlight\">\n<pre class=\"highlight\"><code>To git.synbioz.com:~ebarraco\/hello-world.git  + cfc907c4...d575e61a d575e61a -&gt; oopsi\/fixing-typo <span class=\"o\">(<\/span>forced update<span class=\"o\">)<\/span> <\/code><\/pre>\n<\/div>\n<\/div>\n<p>Ce qui nous int\u00e9resse ici est <code>cfc907c4\u2026d575e61a<\/code>. Cela signifie que le <em>push<\/em> fais passer la r\u00e9f\u00e9rence <code>oopsi\/fixing-typo<\/code> du commit <code>cfc907c4<\/code> au commit <code>d575e61a<\/code>. \u00c0 l\u2019aide de notre souris et de nos petits doigts, utilisons cet intervalle et retirons un point<\/p>\n<div class=\"language-sh highlighter-rouge\">\n<div class=\"highlight\">\n<pre class=\"highlight\"><code><span class=\"nv\">$ <\/span>git diff cfc907c4..d575e61a <\/code><\/pre>\n<\/div>\n<\/div>\n<p>Nous avons l\u00e0 la diff\u00e9rence du code apr\u00e8s notre futur <em>push<\/em>. Si nous n\u2019avons fait que regrouper des commits, la commande ne doit rien renvoyer. Ou alors peut \u00eatre que quelqu\u2019un d\u2019autre a ajout\u00e9 des commits&nbsp;?<\/p>\n<h2 id=\"quelques-mots-pour-la-fin\">Quelques mots pour la fin<\/h2>\n<p>Certains utilisent <code>git rerere<\/code> comme un outil pour simplifier la r\u00e9solution de conflits. Je nous le d\u00e9conseille vivement&nbsp;! Bien au contraire, je souhaite nous pousser \u00e0 garder un \u0153il tr\u00e8s attentif sur les impacts qu\u2019a Git sur notre code. V\u00e9rifions les diff\u00e9rences, nos commits, nos rebases et les impacts de nos push. Usons et abusons du <code>git log -p<\/code> et du <code>git show &lt;git-ref&gt;<\/code> pour lister et afficher dans le d\u00e9tail chacun de nos commits. Et ne soyons pas radins sur les descriptions de ceux-ci&nbsp;!<\/p>\n","protected":false},"excerpt":{"rendered":"<p>Quelques conseils pour maitriser davantage ses rebases Git<\/p>\n","protected":false},"author":10,"featured_media":12468,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"content-type":"","inline_featured_image":false,"fifu_image_url":"","fifu_image_alt":"","footnotes":""},"categories":[34],"tags":[],"class_list":["post-7834","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-articles-techniques"],"acf":[],"yoast_head":"<!-- This site is optimized with the Yoast SEO plugin v28.9 - https:\/\/yoast.com\/product\/yoast-seo-wordpress\/ -->\n<title>Quatres astuces pour maitriser ses rebases - Ouidou<\/title>\n<meta name=\"description\" content=\"D\u00e9couvrez quatre astuces pour ma\u00eetriser vos rebases Git : am\u00e9liorez votre gestion des branches avec les conseils de nos experts.\" \/>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases\" \/>\n<meta property=\"og:locale\" content=\"fr_FR\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Quatres astuces pour maitriser ses rebases - Ouidou\" \/>\n<meta property=\"og:description\" content=\"D\u00e9couvrez quatre astuces pour ma\u00eetriser vos rebases Git : am\u00e9liorez votre gestion des branches avec les conseils de nos experts.\" \/>\n<meta property=\"og:url\" content=\"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases\" \/>\n<meta property=\"og:site_name\" content=\"Ouidou\" \/>\n<meta property=\"article:published_time\" content=\"2021-06-22T22:00:00+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-09-02T14:16:47+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/ouidou.fr\/blog\/wp-content\/uploads\/2021\/06\/Quatres-astuces-pour-maitriser-ses-rebases.png\" \/>\n\t<meta property=\"og:image:width\" content=\"1105\" \/>\n\t<meta property=\"og:image:height\" content=\"564\" \/>\n\t<meta property=\"og:image:type\" content=\"image\/png\" \/>\n<meta name=\"author\" content=\"Sara Lourties\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u00c9crit par\" \/>\n\t<meta name=\"twitter:data1\" content=\"Sara Lourties\" \/>\n\t<meta name=\"twitter:label2\" content=\"Dur\u00e9e de lecture estim\u00e9e\" \/>\n\t<meta name=\"twitter:data2\" content=\"5 minutes\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\\\/\\\/schema.org\",\"@graph\":[{\"@type\":\"Article\",\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/articles-techniques\\\/quatres-astuces-pour-maitriser-ses-rebases#article\",\"isPartOf\":{\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/articles-techniques\\\/quatres-astuces-pour-maitriser-ses-rebases\"},\"author\":{\"name\":\"Sara Lourties\",\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/#\\\/schema\\\/person\\\/e1d66085fb7c22ede319ce56adc373a4\"},\"headline\":\"Quatres astuces pour maitriser ses rebases\",\"datePublished\":\"2021-06-22T22:00:00+00:00\",\"dateModified\":\"2024-09-02T14:16:47+00:00\",\"mainEntityOfPage\":{\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/articles-techniques\\\/quatres-astuces-pour-maitriser-ses-rebases\"},\"wordCount\":901,\"publisher\":{\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/#organization\"},\"image\":{\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/articles-techniques\\\/quatres-astuces-pour-maitriser-ses-rebases#primaryimage\"},\"thumbnailUrl\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/wp-content\\\/uploads\\\/2021\\\/06\\\/Quatres-astuces-pour-maitriser-ses-rebases.png\",\"articleSection\":[\"Articles Techniques\"],\"inLanguage\":\"fr-FR\"},{\"@type\":\"WebPage\",\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/articles-techniques\\\/quatres-astuces-pour-maitriser-ses-rebases\",\"url\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/articles-techniques\\\/quatres-astuces-pour-maitriser-ses-rebases\",\"name\":\"Quatres astuces pour maitriser ses rebases - Ouidou\",\"isPartOf\":{\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/#website\"},\"primaryImageOfPage\":{\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/articles-techniques\\\/quatres-astuces-pour-maitriser-ses-rebases#primaryimage\"},\"image\":{\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/articles-techniques\\\/quatres-astuces-pour-maitriser-ses-rebases#primaryimage\"},\"thumbnailUrl\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/wp-content\\\/uploads\\\/2021\\\/06\\\/Quatres-astuces-pour-maitriser-ses-rebases.png\",\"datePublished\":\"2021-06-22T22:00:00+00:00\",\"dateModified\":\"2024-09-02T14:16:47+00:00\",\"description\":\"D\u00e9couvrez quatre astuces pour ma\u00eetriser vos rebases Git : am\u00e9liorez votre gestion des branches avec les conseils de nos experts.\",\"breadcrumb\":{\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/articles-techniques\\\/quatres-astuces-pour-maitriser-ses-rebases#breadcrumb\"},\"inLanguage\":\"fr-FR\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\\\/\\\/ouidou.fr\\\/blog\\\/articles-techniques\\\/quatres-astuces-pour-maitriser-ses-rebases\"]}]},{\"@type\":\"ImageObject\",\"inLanguage\":\"fr-FR\",\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/articles-techniques\\\/quatres-astuces-pour-maitriser-ses-rebases#primaryimage\",\"url\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/wp-content\\\/uploads\\\/2021\\\/06\\\/Quatres-astuces-pour-maitriser-ses-rebases.png\",\"contentUrl\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/wp-content\\\/uploads\\\/2021\\\/06\\\/Quatres-astuces-pour-maitriser-ses-rebases.png\",\"width\":1105,\"height\":564},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/articles-techniques\\\/quatres-astuces-pour-maitriser-ses-rebases#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"Accueil\",\"item\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Quatres astuces pour maitriser ses rebases\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/#website\",\"url\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/\",\"name\":\"Blog Ouidou\",\"description\":\"Conseil et expertise en technologies\",\"publisher\":{\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/#organization\"},\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/?s={search_term_string}\"},\"query-input\":{\"@type\":\"PropertyValueSpecification\",\"valueRequired\":true,\"valueName\":\"search_term_string\"}}],\"inLanguage\":\"fr-FR\"},{\"@type\":\"Organization\",\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/#organization\",\"name\":\"Ouidou\",\"url\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/\",\"logo\":{\"@type\":\"ImageObject\",\"inLanguage\":\"fr-FR\",\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/#\\\/schema\\\/logo\\\/image\\\/\",\"url\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/wp-content\\\/uploads\\\/2022\\\/04\\\/image_2022-04-13_150237378.png\",\"contentUrl\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/wp-content\\\/uploads\\\/2022\\\/04\\\/image_2022-04-13_150237378.png\",\"width\":180,\"height\":180,\"caption\":\"Ouidou\"},\"image\":{\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/#\\\/schema\\\/logo\\\/image\\\/\"}},{\"@type\":\"Person\",\"@id\":\"https:\\\/\\\/ouidou.fr\\\/blog\\\/#\\\/schema\\\/person\\\/e1d66085fb7c22ede319ce56adc373a4\",\"name\":\"Sara Lourties\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"fr-FR\",\"@id\":\"https:\\\/\\\/secure.gravatar.com\\\/avatar\\\/b2ef32f9fc1e16168b39587a2ec1dafedc70a9d41fa1b4a930ec7744b3e35ec7?s=96&d=mm&r=g\",\"url\":\"https:\\\/\\\/secure.gravatar.com\\\/avatar\\\/b2ef32f9fc1e16168b39587a2ec1dafedc70a9d41fa1b4a930ec7744b3e35ec7?s=96&d=mm&r=g\",\"contentUrl\":\"https:\\\/\\\/secure.gravatar.com\\\/avatar\\\/b2ef32f9fc1e16168b39587a2ec1dafedc70a9d41fa1b4a930ec7744b3e35ec7?s=96&d=mm&r=g\",\"caption\":\"Sara Lourties\"}}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"Quatres astuces pour maitriser ses rebases - Ouidou","description":"D\u00e9couvrez quatre astuces pour ma\u00eetriser vos rebases Git : am\u00e9liorez votre gestion des branches avec les conseils de nos experts.","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases","og_locale":"fr_FR","og_type":"article","og_title":"Quatres astuces pour maitriser ses rebases - Ouidou","og_description":"D\u00e9couvrez quatre astuces pour ma\u00eetriser vos rebases Git : am\u00e9liorez votre gestion des branches avec les conseils de nos experts.","og_url":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases","og_site_name":"Ouidou","article_published_time":"2021-06-22T22:00:00+00:00","article_modified_time":"2024-09-02T14:16:47+00:00","og_image":[{"width":1105,"height":564,"url":"https:\/\/ouidou.fr\/blog\/wp-content\/uploads\/2021\/06\/Quatres-astuces-pour-maitriser-ses-rebases.png","type":"image\/png"}],"author":"Sara Lourties","twitter_card":"summary_large_image","twitter_misc":{"\u00c9crit par":"Sara Lourties","Dur\u00e9e de lecture estim\u00e9e":"5 minutes"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"Article","@id":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases#article","isPartOf":{"@id":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases"},"author":{"name":"Sara Lourties","@id":"https:\/\/ouidou.fr\/blog\/#\/schema\/person\/e1d66085fb7c22ede319ce56adc373a4"},"headline":"Quatres astuces pour maitriser ses rebases","datePublished":"2021-06-22T22:00:00+00:00","dateModified":"2024-09-02T14:16:47+00:00","mainEntityOfPage":{"@id":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases"},"wordCount":901,"publisher":{"@id":"https:\/\/ouidou.fr\/blog\/#organization"},"image":{"@id":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases#primaryimage"},"thumbnailUrl":"https:\/\/ouidou.fr\/blog\/wp-content\/uploads\/2021\/06\/Quatres-astuces-pour-maitriser-ses-rebases.png","articleSection":["Articles Techniques"],"inLanguage":"fr-FR"},{"@type":"WebPage","@id":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases","url":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases","name":"Quatres astuces pour maitriser ses rebases - Ouidou","isPartOf":{"@id":"https:\/\/ouidou.fr\/blog\/#website"},"primaryImageOfPage":{"@id":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases#primaryimage"},"image":{"@id":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases#primaryimage"},"thumbnailUrl":"https:\/\/ouidou.fr\/blog\/wp-content\/uploads\/2021\/06\/Quatres-astuces-pour-maitriser-ses-rebases.png","datePublished":"2021-06-22T22:00:00+00:00","dateModified":"2024-09-02T14:16:47+00:00","description":"D\u00e9couvrez quatre astuces pour ma\u00eetriser vos rebases Git : am\u00e9liorez votre gestion des branches avec les conseils de nos experts.","breadcrumb":{"@id":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases#breadcrumb"},"inLanguage":"fr-FR","potentialAction":[{"@type":"ReadAction","target":["https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases"]}]},{"@type":"ImageObject","inLanguage":"fr-FR","@id":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases#primaryimage","url":"https:\/\/ouidou.fr\/blog\/wp-content\/uploads\/2021\/06\/Quatres-astuces-pour-maitriser-ses-rebases.png","contentUrl":"https:\/\/ouidou.fr\/blog\/wp-content\/uploads\/2021\/06\/Quatres-astuces-pour-maitriser-ses-rebases.png","width":1105,"height":564},{"@type":"BreadcrumbList","@id":"https:\/\/ouidou.fr\/blog\/articles-techniques\/quatres-astuces-pour-maitriser-ses-rebases#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"Accueil","item":"https:\/\/ouidou.fr\/blog\/"},{"@type":"ListItem","position":2,"name":"Quatres astuces pour maitriser ses rebases"}]},{"@type":"WebSite","@id":"https:\/\/ouidou.fr\/blog\/#website","url":"https:\/\/ouidou.fr\/blog\/","name":"Blog Ouidou","description":"Conseil et expertise en technologies","publisher":{"@id":"https:\/\/ouidou.fr\/blog\/#organization"},"potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/ouidou.fr\/blog\/?s={search_term_string}"},"query-input":{"@type":"PropertyValueSpecification","valueRequired":true,"valueName":"search_term_string"}}],"inLanguage":"fr-FR"},{"@type":"Organization","@id":"https:\/\/ouidou.fr\/blog\/#organization","name":"Ouidou","url":"https:\/\/ouidou.fr\/blog\/","logo":{"@type":"ImageObject","inLanguage":"fr-FR","@id":"https:\/\/ouidou.fr\/blog\/#\/schema\/logo\/image\/","url":"https:\/\/ouidou.fr\/blog\/wp-content\/uploads\/2022\/04\/image_2022-04-13_150237378.png","contentUrl":"https:\/\/ouidou.fr\/blog\/wp-content\/uploads\/2022\/04\/image_2022-04-13_150237378.png","width":180,"height":180,"caption":"Ouidou"},"image":{"@id":"https:\/\/ouidou.fr\/blog\/#\/schema\/logo\/image\/"}},{"@type":"Person","@id":"https:\/\/ouidou.fr\/blog\/#\/schema\/person\/e1d66085fb7c22ede319ce56adc373a4","name":"Sara Lourties","image":{"@type":"ImageObject","inLanguage":"fr-FR","@id":"https:\/\/secure.gravatar.com\/avatar\/b2ef32f9fc1e16168b39587a2ec1dafedc70a9d41fa1b4a930ec7744b3e35ec7?s=96&d=mm&r=g","url":"https:\/\/secure.gravatar.com\/avatar\/b2ef32f9fc1e16168b39587a2ec1dafedc70a9d41fa1b4a930ec7744b3e35ec7?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/b2ef32f9fc1e16168b39587a2ec1dafedc70a9d41fa1b4a930ec7744b3e35ec7?s=96&d=mm&r=g","caption":"Sara Lourties"}}]}},"_links":{"self":[{"href":"https:\/\/ouidou.fr\/blog\/wp-json\/wp\/v2\/posts\/7834","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/ouidou.fr\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/ouidou.fr\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/ouidou.fr\/blog\/wp-json\/wp\/v2\/users\/10"}],"replies":[{"embeddable":true,"href":"https:\/\/ouidou.fr\/blog\/wp-json\/wp\/v2\/comments?post=7834"}],"version-history":[{"count":2,"href":"https:\/\/ouidou.fr\/blog\/wp-json\/wp\/v2\/posts\/7834\/revisions"}],"predecessor-version":[{"id":9041,"href":"https:\/\/ouidou.fr\/blog\/wp-json\/wp\/v2\/posts\/7834\/revisions\/9041"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/ouidou.fr\/blog\/wp-json\/wp\/v2\/media\/12468"}],"wp:attachment":[{"href":"https:\/\/ouidou.fr\/blog\/wp-json\/wp\/v2\/media?parent=7834"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/ouidou.fr\/blog\/wp-json\/wp\/v2\/categories?post=7834"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/ouidou.fr\/blog\/wp-json\/wp\/v2\/tags?post=7834"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}