Commit graph

Select branches

Hide pull requests

conflit

conflit2

hazar

master

#1

Mono Color

• d6aa1fd095 I want to have a conflict ! conflit2 Toto 2023-02-16 15:20:36 +0100
• 84ce28a76d Conflit2 master Toto 2023-02-16 15:19:58 +0100
• 10a495f783 creer un conflit conflit Hamouda Hazar 2023-02-16 15:14:39 +0100
• e0f5be3bc0 Merge branch 'master' of https://git.etud.insa-toulouse.fr/hamoud/tutClubInfo Hamouda Hazar 2023-02-16 15:11:54 +0100
• 9548b25628 Adding some code Toto 2023-02-16 15:11:44 +0100
• e026c49f86 Merge branch 'master' of https://git.etud.insa-toulouse.fr/hamoud/tutClubInfo Hamouda Hazar 2023-02-16 15:09:31 +0100
• 8e60c04b2a Create a file to do conflict Toto 2023-02-16 15:09:02 +0100
• 8328ce399c pushing essai1 into the main branch hazar Hamouda Hazar 2023-02-16 15:00:57 +0100
• 84e0d8405b pulling the master branch Hamouda Hazar 2023-02-16 14:56:18 +0100
• 34f1a3ca21 Merge branch 'new_branch' of gonet/tutClubInfo into master Hazar Hamouda 2023-02-16 14:53:46 +0100
• dca68edc8e This is a commit message Toto 2023-02-16 14:48:57 +0100
• 34876d5b3d first commit Hamouda Hazar 2023-02-16 14:32:46 +0100