Important
Version sans conflit
- git Pull remote-friend main
- git branch new-feature
- (new-feature) git add . ; git commit
- git checkout main
- git pull remote-friend
- git merge new-feature
- git push my-remote main
- git branch -d new-feature
flowchart TB
A{{Main C0}} --> B[git pull remote
Main C1]
B -->|git branch new-feature| C[new-feature C0]
subgraph new-feature
C --> |git add. ; git commit|D[new-feature
C1]
end
D --> |git checkout main|E
subgraph main
B ---->E[Main C1]
E --> |git pull remote-friend| F[Main C2]
F --> | git merge new-feature| G[Main C3]
G ==> |git push my-remote| H{{Main C3}}
H -..- |git branch -d new-feature| I{{Ready for new granch}}
end
Important
bien comprendre comment découper l'entrée utilisateur séparateur : | ( ) &
erreur de syntax | ou & en dédut de string &| n'importe où