Skip to content

Dev #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prachighosh84 wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

Dev #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
763cc0e
changes in html
Nov 3, 2025
3d83111
prachi
Nov 3, 2025
819b346
second commit
Nov 3, 2025
d1e91ca
third commit
Nov 3, 2025
57b4796
first commit
hamletarm Nov 3, 2025
4a9dd53
second commit
hamletarm Nov 3, 2025
f0114b9
third commit
hamletarm Nov 3, 2025
a9e592b
merge
hamletarm Nov 3, 2025
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
2 changes: 1 addition & 1 deletion app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ document.addEventListener('DOMContentLoaded', () => {
log.textContent = [
'v0.0.1: Repo initialisé.',
'Consigne: créer deux branches et provoquer un petit conflit contrôlé.',
'Astuce: modifiez la même ligne du <h1> ci-dessus pour déclencher un conflit.'
'Astuce: modifiez la même ligne du <h1> ci-dessus pour déclencher un conflit Hamlet.'
].join('\n');
});
6 changes: 3 additions & 3 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<body>
<header>
<!-- ⚠️ Conflit facile : beaucoup vont modifier cette ligne -->
<h1>Bienvenue sur Git Arena 👋</h1>
<p class="tagline">Collaborez, commitez, résolvez — sans drama.</p>
<h1>Bienvenue sur Git Arena 👋 hello</h1>
<p class="tagline parat-text">Collaborez, commitez, résolvez — sans drama.</p>
</header>
<main>
<section>
<h2>Règles du jeu</h2>
<h2>To change Hamlet</h2>
<ul>
<li>Travaillez en binôme sur deux branches : <code>feature/</code> et <code>fix/</code>.</li>
<li>Faites des petits commits fréquents.</li>
Expand Down
6 changes: 5 additions & 1 deletion style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
*{box-sizing:border-box}body{font-family:system-ui,Segoe UI,Roboto,Arial,sans-serif;line-height:1.5;margin:0;padding:2rem;background:#0f172a;color:#e2e8f0}
header{margin-bottom:1.25rem}
h1{margin:0 0 .25rem 0}
.tagline{opacity:.8}
.tagline{opacity:.18}
code,pre{background:#0b1220;border:1px solid #1f2937;padding:.25rem .5rem;border-radius:.375rem}
ul{margin:.5rem 0 0 1rem}

.para-text{
font-size: 24px;
}
12 changes: 12 additions & 0 deletions test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>test page</title>
</head>
<body>
<h1>this is a test page</h1>

</body>
</html>