search

erpreciso / school-tagging

school-tagging project repo
GNU General Public License v3.0
2 stars 3 forks source link

Deployed en 9c #67

Closed kercos closed 9 years ago

kercos commented 9 years ago

Non sono sicuro questa sia una buona pull request perché mi da come base fork la tua master. Se la cambio nella commit da dove la mia branch si biforca 542ea921eafd779e non mi fa fare la pull request... Immagino ci capirai meglio tu, ma fai attenzione a non fare la merge nella main

erpreciso commented 9 years ago

Ciao, all'indirizzo https://github.com/erpreciso/school-tagging/tree/deployed dovrebbe esserci la tua versione. Prova a dargli un occhio dal browser

On Wed, Jan 14, 2015 at 1:31 PM, Federico notifications@github.com wrote:

Non sono sicuro questa sia una buona pull request perché mi da come base fork la tua master. Se la cambio nella commit da dove la mia branch si biforca 542ea92 https://github.com/erpreciso/school-tagging/commit/542ea921eafd779eecdccc31ba06b6d22828ff3e non mi fa fare la pull request... Immagino ci capirai meglio tu, ma fai

attenzione a non fare la merge nella main

You can merge this Pull Request by running

git pull https://github.com/kercos/school-tagging deployed_en_9c

Or view, comment on, or merge it at:

https://github.com/erpreciso/school-tagging/pull/67 Commit Summary

  • changed sentence pool with english sentences
  • Converted all strings to English
  • Changing version to 9c to align to web app

File Changes

Patch Links:

— Reply to this email directly or view it on GitHub https://github.com/erpreciso/school-tagging/pull/67.

kercos commented 9 years ago

si, proprio come dovrebbe essere. come hai fatto? hai creato un branch prima e fatto il merge su quella?

erpreciso commented 9 years ago

si, ecco i comandi

git checkout --detach 542ea92
git checkout -b kercos-deployed_en_9c deployed
git pull https://github.com/kercos/school-tagging.git deployed_en_9
git checkout deployed
git merge --no-ff kercos-deployed_en_9c
git push origin deployed
kercos commented 9 years ago

uii, advanced!

On 15 Jan 2015, at 06:19, erpreciso notifications@github.com wrote:

si, ecco i comandi

git checkout --detach 542ea92 git checkout -b kercos-deployed_en_9c deployed git pull https://github.com/kercos/school-tagging.git deployed_en_9 git checkout deployed git merge --no-ff kercos-deployed_en_9c git push origin deployed — Reply to this email directly or view it on GitHub https://github.com/erpreciso/school-tagging/pull/67#issuecomment-70041091.

erpreciso commented 9 years ago

eh mica mi è riuscito al primo colpo :-) On Jan 15, 2015 10:56 AM, "Federico" notifications@github.com wrote:

uii, advanced!

On 15 Jan 2015, at 06:19, erpreciso notifications@github.com wrote:

si, ecco i comandi

git checkout --detach 542ea92 git checkout -b kercos-deployed_en_9c deployed git pull https://github.com/kercos/school-tagging.git deployed_en_9 git checkout deployed git merge --no-ff kercos-deployed_en_9c git push origin deployed — Reply to this email directly or view it on GitHub < https://github.com/erpreciso/school-tagging/pull/67#issuecomment-70041091>.

— Reply to this email directly or view it on GitHub https://github.com/erpreciso/school-tagging/pull/67#issuecomment-70062947 .