search

Doveps / mono

Code for Doveps projects
http://doveps.com
MIT License
0 stars 0 forks source link

Issue32 #38

Closed JosiahRegencia closed 7 years ago

JosiahRegencia commented 7 years ago

This is already for both issue #32 and #33

greenmoss commented 7 years ago

Needs merge from master and resolve conflicts

JosiahRegencia commented 7 years ago

Okay. But, I'm still actually confused about the merging stuff. What I think of is:

  1. Checkout my_branch
  2. git pull origin master.

Is that correct?

greenmoss commented 7 years ago

yeah, that's about right

git fetch -ap
git checkout issue32
git pull origin master
JosiahRegencia commented 7 years ago

right will do

JosiahRegencia commented 7 years ago

I'm just going to be pushing it in master right?

greenmoss commented 7 years ago
JosiahRegencia commented 7 years ago

Right. I forgot which branch I was. But about the tests passing, I'm still looking for a solution that allows me to upload file in unittests

JosiahRegencia commented 7 years ago

Finally got it to pass in travis. But I don't really understand codeclimate yet