aguillaume
commented
9 years ago The two pull will really affect each other because i changed the code over each other.. will have to make some changes to the code on this merge.
Closed aguillaume closed 9 years ago
aguillaume
commented
9 years ago The two pull will really affect each other because i changed the code over each other.. will have to make some changes to the code on this merge.
ruta-goomba
commented
9 years ago Now we know what happens – first pull request merges fine, but there is a conflict when trying to merge the second one since develop branch got updated when the first one got merged.
From: Guillaume [mailto:notifications@github.com] Sent: 27 February 2015 00:42 To: aguillaume/TicTacToe Subject: [TicTacToe] Adding Helper functions (#11)
added helper funciton for setting and getting innerHTML from the dom.
Also lets see what happens with two pull requests to the same brach from two diff branches on the same file.
You can view, comment on, or merge this pull request online at:
https://github.com/aguillaume/TicTacToe/pull/11
Commit Summary
File Changes
Patch Links:
— Reply to this email directly or view it on GitHubhttps://github.com/aguillaume/TicTacToe/pull/11.
This is a confidential email. Tesco may monitor and record all emails. The views expressed in this email are those of the sender and not Tesco.
Tesco Stores Limited Company Number: 519500 Registered in England Registered Office: Tesco House, Delamare Road, Cheshunt, Hertfordshire EN8 9SL VAT Registration Number: GB 220 4302 31
added helper funciton for setting and getting innerHTML from the dom.
Also lets see what happens with two pull requests to the same brach from two diff branches on the same file.