Introduction au gestionnaire de version GIT

WP Meetup Geneva

<!DOCTYPE html>
<html>
<body class="toto">

<h1>My First Heading</h1>
<p>My first paragraph.</p>

</body>
</html>

<!DOCTYPE html>
<html>
<body class="toto titi">

<h1><?php the_title(); ?></h1>
<p>My first paragraph.</p>

</body>
</html>

push changes : git push origin evol/2
we can change branches (content) as we want : git checkout evol/1
on server, only get the modifications : git fetch -a
to apply the new modifications : git pull -f
finally merge the two branches on master :
- go on master : git checkout master
- merge branches : git merge evol/1 and git merge evol/2
it results into a conflict :
- edit the final modification into the file
- stage changes : git add .
- then commit them : git commit -m "Resolved merge conflict by incorporating both suggestions."

Name		Name	Last commit message	Last commit date
Latest commit History 33 Commits
wp-admin		wp-admin
wp-content		wp-content
wp-includes		wp-includes
.gitignore_save		.gitignore_save
.htaccess		.htaccess
index.php		index.php
license.txt		license.txt
maxime.php		maxime.php
readme.md		readme.md
wp-activate.php		wp-activate.php
wp-blog-header.php		wp-blog-header.php
wp-comments-post.php		wp-comments-post.php
wp-config-sample.php		wp-config-sample.php
wp-config.php		wp-config.php
wp-cron.php		wp-cron.php
wp-links-opml.php		wp-links-opml.php
wp-load.php		wp-load.php
wp-login.php		wp-login.php
wp-mail.php		wp-mail.php
wp-settings.php		wp-settings.php
wp-signup.php		wp-signup.php
wp-trackback.php		wp-trackback.php
xmlrpc.php		xmlrpc.php