search

Mobiperf / MobiPerf

New MobiPerf Repository
http://mobiperf.com
Other
87 stars 62 forks source link

Config for enabling (and securing) data validation. #40

Closed drchoffnes closed 12 years ago

mdwelsh commented 12 years ago

This can't be auto merged, please update your branch and try again.

drchoffnes commented 12 years ago

Sorry for the ugly commit -- I didn't realize that it would include all the files from updating the branch. Let me retry...

drchoffnes commented 12 years ago

If you have any advice on how to clean up this commit, please let me know. I haven't been able to figure it out...

mdwelsh commented 12 years ago

Eeep. Can you try using git rebase instead of git merge? What you can do is revert your latest commit (6e1f76e) and then git rebase master from your dev branch.

drchoffnes commented 12 years ago

I think it's better now. All this for a spacing change. Can't wait to start using the new code review system instead.

On Tue, May 29, 2012 at 7:18 PM, Matt Welsh reply@reply.github.com wrote:

Eeep. Can you try using git rebase instead of git merge? What you can do is revert your latest commit (6e1f76e) and then git rebase master from your dev branch.

Reply to this email directly or view it on GitHub: https://github.com/Mobiperf/MobiPerf/pull/40#issuecomment-6000792