Skip to content

solomongamid #1

Open
solomongamid wants to merge 4 commits intosimplonco:masterfrom
solomongamid:master
Open

solomongamid #1
solomongamid wants to merge 4 commits intosimplonco:masterfrom
solomongamid:master

Conversation

@solomongamid
Copy link
Copy Markdown

No description provided.

@yvan-sraka
Copy link
Copy Markdown
Contributor

Your solution looks great 👍 !

You just have to:

  • move your file in the right folder => mv formsend.php "Montreuil - Promo 5/solomongamid/"
  • indent your source code (could use Atom Beautifer or found other tool on the net)

Then I will merge your Pull-Request 😉

@yvan-sraka yvan-sraka changed the title suliman addition solomongamid Jun 14, 2016
@@ -0,0 +1,26 @@
# PHP Send Mail Form
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the main README.md, don't need to copy it 😉 !

@yvan-sraka
Copy link
Copy Markdown
Contributor

Checkout via command line

If you cannot merge a pull request automatically here, you have the option of checking it out via command line to resolve conflicts and perform a manual merge.

Step 1: From your project repository, check out a new branch and test the changes.

git checkout -b solomongamid-master master
git pull https://github.com/solomongamid/php-send-mail-form.git master

Step 2: Merge the changes and update on GitHub.

git checkout master
git merge --no-ff solomongamid-master
git push origin master

@solomongamid
Copy link
Copy Markdown
Author

merci Yvan

On Fri, Jun 17, 2016 at 10:52 AM, Yvan Sraka notifications@github.com
wrote:

Checkout via command line

If you cannot merge a pull request automatically here, you have the option
of checking it out via command line to resolve conflicts and perform a
manual merge.

Step 1: From your project repository, check out a new branch and test
the changes.

git checkout -b solomongamid-master master
git pull https://github.com/solomongamid/php-send-mail-form.git master

Step 2: Merge the changes and update on GitHub.

git checkout master
git merge --no-ff solomongamid-master
git push origin master


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#1 (comment),
or mute the thread
https://github.com/notifications/unsubscribe/ARJdJKB52Qk6IleBsvtxyFzxXNfRQDq6ks5qMmA8gaJpZM4I1eSS
.

@yvan-sraka
Copy link
Copy Markdown
Contributor

This branch has conflicts that must be resolved
Use the command line to resolve conflicts before continuing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants