Accueil Explorer Aide
Connexion
TECLIM
/
Git_Training
8
0
Fork 0
Fichiers Tickets 1 Pull Requests 0 Wiki
Aborescence: a8721c112a
Branches Tags
Git_Training
/
exercices
/
ex.5
Pierre-Yves Barriat a8721c112a Update 'exercices/ex.5/win_create.bat' il y a 2 ans
..
README.md 7fe9b59e6b Ending conversion bash to batch il y a 2 ans
linux_create.sh 7fe9b59e6b Ending conversion bash to batch il y a 2 ans
win_create.bat a8721c112a Update 'exercices/ex.5/win_create.bat' il y a 2 ans

README.md

You just ran a git fetch and realize someone has modified the exact file at the exact line that you just worked on.

You want the current state of your working directory to be saved.

Conflict seems inevitable.

  • create a commit with the new version of first.txt
  • use git pull to merge origin/master into your master
  • resolve the conflict in first.txt
  • commit