Différences
Ci-dessous, les différences entre deux révisions de la page.
| |
| tech:git_gestion_des_conflits_merge [2025/03/24 15:06] – créée - modification externe 127.0.0.1 | tech:git_gestion_des_conflits_merge [2025/04/26 11:09] (Version actuelle) – Jean-Baptiste |
|---|
| * [[https://opensource.com/article/23/4/resolve-git-merge-conflicts|How to resolve Git merge conflicts]] | * [[https://opensource.com/article/23/4/resolve-git-merge-conflicts|How to resolve Git merge conflicts]] |
| * [[https://developers.redhat.com/articles/2023/09/07/drop-git-pull-fetch-and-rebase|Drop git pull for fetch and rebase]] | * [[https://developers.redhat.com/articles/2023/09/07/drop-git-pull-fetch-and-rebase|Drop git pull for fetch and rebase]] |
| ** Mais remplacez ''git push --force'' par ''git push --force-with-lease'' | * Mais remplacez ''git push --force'' par ''git push --force-with-lease'' |
| ** https://blog.stack-labs.com/code/git_force_with_lease/ | * https://blog.stack-labs.com/code/git_force_with_lease/ |
| * https://www.dynamic-mess.com/developpement/git-merge-fast-forward-rebase-culture-git/ | * https://www.dynamic-mess.com/developpement/git-merge-fast-forward-rebase-culture-git/ |
| * https://nitaym.github.io/ourstheirs/ | * https://nitaym.github.io/ourstheirs/ |
