search

anwar-ul-azim / green-city

A Cross-platform Web Application for Sharing Bicycle
0 stars 0 forks source link

multi-language #8

Closed anwar-ul-azim closed 5 years ago

anwar-ul-azim commented 5 years ago

use django default multi language support

anwar-ul-azim commented 5 years ago

Screenshot_2019-05-15 Green City

paul-pias commented 5 years ago

Merge GC_Multilanguage branch to GC_design branch. Let me know if it works or not.

anwar-ul-azim commented 5 years ago

tui vol merge korsos, tao aee problem ki merge korlaee thik hoar kotha?

anwar-ul-azim commented 5 years ago

tui ja korsos ta holo: Merge branch 'GC_design' of https://github.com/anwar-ul-azim/green-city into GC_design

2 commit old gc_design , gc_design udated er sathe merge hoisa//

anwar-ul-azim commented 5 years ago

kaj hoile oi branch aee hoitu

paul-pias commented 5 years ago

I didn't merge. I just created a new branch to push my work and merged in GC_design. See the attached pic as a reference. Not understanding my error here. :( :( IMG20190515204607

anwar-ul-azim commented 5 years ago

where is your new branch?? New Bitmap Image

anwar-ul-azim commented 5 years ago

upor a bolli Merge GC_Multilanguage branch to GC_design branch. Let me know if it works or not. er por bolli I didn't merge. mane ki???

paul-pias commented 5 years ago

tui ja korsos ta holo: Merge branch 'GC_design' of https://github.com/anwar-ul-azim/green-city into GC_design

2 commit old gc_design , gc_design udated er sathe merge hoisa//

I didn't merge likhata eitar jnno chilo. ami eivabe merge krinai. first e amr ja kaj chilo GC_Multilanguage branch(nicher pic e dekh branch ta) e push krsi then GC_design er sathe merge krsi. r eikhane dekha jaitese GC_Design e amr kaj merge krar poreo 2ta alda tree e chole gese( which i don't know why). ekhn ki ami abr GC_design e merge kre dibo?

git

anwar-ul-azim commented 5 years ago

merge kore doi karone 1 to get the latest update 2 to submit your final work ekhon tui kon karone merge korte chaitasos??

anwar-ul-azim commented 5 years ago

merge korar age tor local baranch origin er sathe update thaka lage,,, tor somoy cilo na tai doi ta alada tree hoisa..

paul-pias commented 5 years ago

Because, amr end theke ekhno issue ta resolve hoynai as GC_Design e ekhno ager code dekhacche.

2 3

anwar-ul-azim commented 5 years ago

gc design a language er last 3 ta commit merge hoy nai tai emon dekhaitase,, ekhon etai merge korar uddeso na, tui multi language jekono ek brancha kaj korate parlayee holo,

anwar-ul-azim commented 5 years ago

merge kore dilam,, pull kore dekh