search

timozattol / project-radin

Project Radin is an expense management Android application that was build during EPFL's Software Engineering 2014 course.
2 stars 2 forks source link

Issue#77 #79

Closed WiseIndian closed 10 years ago

WiseIndian commented 10 years ago

J'ai quelques soucis avec mon local git repo qui me dit que mon master n'est pas up to date avec le remote mais je suis quasi sûr que c'est bon donc je créé un petit pull request voir si ça pourrait aider à résoudre le conflit

dslab-service commented 10 years ago

Can one of the admins verify this patch?

WiseIndian commented 10 years ago

I thought this would generate a build from Jenkins(I guess we didn't configure it enough yet), to see if my pull request would generate conflicts in master.

I did that because I'm having some trouble pushing the merge of my branch with master(Every tests work well with my changes which don't interfere with other's people work which we can see from "files changed"(Exception made with RadinGroupJSONParser but here it's just changes on fake fields))

Maybe I failed at maintaining a clean history because when I "git push" it says [rejected] issue#40 -> issue#40 (non-fast-forward) [rejected] issue#61-fake-json-parser -> issue#61-fake-json-parser (non-fast-forward) [rejected] issue#7 -> issue#7 (non-fast-forward)

StackOverFlow hasn't shown me an answer yet

but honestly this seem a bit complex if anyone has an idea I'll try it

timozattol commented 10 years ago

Is it fixed ? I didn't understand everything

WiseIndian commented 10 years ago

Yup i did succeed in merging :)