Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
da0a81f
Merge pull request #2 from ETICINSATechnologies/master
Oct 1, 2016
719d4ea
Corrections ReadMe
nsorin Oct 1, 2016
215d507
Merge pull request #3 from nsorin/modifReadme
Oct 1, 2016
fee66db
test de modif
Oct 2, 2016
db7ddef
Ajout fichier nicolas
nsorin Oct 2, 2016
a7b2de0
Ajout fichier Aurore
aurore-l Oct 2, 2016
7688c1a
Quentin suce
FlavMarty Oct 2, 2016
21ed43a
ajout fichier Quentin
quent141 Oct 2, 2016
9f21999
Ajout fichier
thibautissenhuth Oct 2, 2016
523df87
Ajout fichier
Oct 2, 2016
7b3f001
Ajout Fichier Thomas
Oct 2, 2016
4d42f98
test2
Oct 2, 2016
490c369
Ajout fichier
JuCN Oct 2, 2016
8df5277
ajout fichier Quentin
quent141 Oct 2, 2016
8d0c13d
effacé
FlavMarty Oct 2, 2016
66c9b05
Suppression fichier Aurore
aurore-l Oct 2, 2016
6b906ad
Ajout Aurore
aurore-l Oct 2, 2016
df6e8b6
Merge pull request #5 from marcfal/test
Oct 2, 2016
2db66b8
Update Quentin
quent141 Oct 2, 2016
ea784e5
Merge pull request #6 from FlavMarty/Flavien
Oct 2, 2016
288e364
Merge pull request #7 from nsorin/brancheNicolas
Oct 2, 2016
015805d
Merge pull request #8 from quent141/Branche@
Oct 2, 2016
d99dabd
Merge pull request #9 from thbts/branchetest
Oct 2, 2016
382caae
Merge pull request #10 from JuCN/test
Oct 2, 2016
e06c903
Merge pull request #11 from ThomasLamalle/branchethomas
Oct 2, 2016
ce58c69
Merge pull request #12 from aurore-l/brancheAurore
Oct 2, 2016
a46c92d
Merge pull request #13 from ahamroun/racine
Oct 2, 2016
c8a35a6
ajoute fichier
SachBar Oct 3, 2016
8f87581
ajout dudu
nsorin Oct 3, 2016
5e014ce
Merge pull request #15 from nsorin/azerty
Oct 3, 2016
d3e432d
Merge pull request #14 from SachBar/brancheTest
Oct 3, 2016
b3ca886
ex1 Sacha
SachBar Oct 12, 2016
0d085c8
commit du TP1 et un fichier test
Oct 12, 2016
718ed27
Merge pull request #16 from SachBar/develop
Oct 13, 2016
8db2667
Merge pull request #17 from ThomasLamalle/BrancheThomasTP1
Oct 13, 2016
4faac20
TP1 dsi
aurore-l Oct 13, 2016
a293a9e
Merge pull request #19 from aurore-l/TP1Aurore
Oct 14, 2016
a25f69e
Tp2 Sacha
SachBar Oct 18, 2016
88e2a89
Merge pull request #21 from SachBar/tpSacha
SachBar Oct 12, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added Aurore
Empty file.
2 changes: 2 additions & 0 deletions Quentin
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Flavien Marty suce des ...
ChupaChups
16 changes: 14 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

Bienvenue sur le dépot de formation de la DSI d'Etic.


## Les étapes pour contribuer à un projet :

### Pour démarrer sur un projet
Expand All @@ -13,6 +14,11 @@ Bienvenue sur le dépot de formation de la DSI d'Etic.
git clone <adresse du fork>
```

- Aller dans le dossier nouvellement créé :
```
cd <nom du depot>
```

- Configurer le remote upstream avec la commande :
```
git remote add upstream <adresse du dépôt original>
Expand Down Expand Up @@ -59,14 +65,20 @@ Bienvenue sur le dépot de formation de la DSI d'Etic.
git fetch upstream
```

- Aller sur la branche develop locale avec la commande :
```
git checkout develop
```

- Merger l'état du dépôt original avec la commande :
```
git merge upstream/<nom de la branche>
git merge upstream/develop
```

- Push les modifications sur le fork avec la commande :
```
git push origin <nom de la branche>
git push origin develop
```



3 changes: 3 additions & 0 deletions Sacha Part2/.idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Sacha Part2/.idea/film.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions Sacha Part2/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Sacha Part2/.idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Sacha Part2/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading