search

CodeCatz / TrackCat

A tool for tracking the progress of the kittens (and cat{s,z}) in our CodeCatz meetup group
MIT License
5 stars 14 forks source link

About page finalisation #120

Closed PettraV closed 9 years ago

PettraV commented 9 years ago

@fbbunny moved members to members page, therefore I deleted the unnecessary code. I cannot decrease font-size of class=intro paragraph. Fonts should be 12 px, but they look at least 20px. Any idea how to resolve this before the merge? Now let me continue with querysets....Thank you :)

jurecuhalev commented 9 years ago

You're mixing migrations and design in this pull request. In addition to that, you're trying to pull in migration without any models.py changes. This won't work.

PettraV commented 9 years ago

i do not know how this happen, I was working on a branch...What should I do...delete the PR?

jurecuhalev commented 9 years ago

No, just remove that migration from this branch.

PettraV commented 9 years ago

pls explain :)

goranche commented 9 years ago

now you still need to remove the migration, as @gandalfar mentioned already

api/migrations/0002_auto_20150201_0824.py

we can't see what changed you have made to your local repository, so please make sure you don't need the migration on the 'about' branch. check if you have made any changed to the model, that require the migration to be applied. if you're sure you've not, just delete the file and add a commit...

goranche commented 9 years ago

also, learn about git staging and how not to include all modified files in a git commit

PettraV commented 9 years ago

thx for the hint :) migrations deleted, should i delete also 00001?

PettraV commented 9 years ago

As regard the staging I have a problem I do not understand. I use different branches and push on github branches, but even if i work different files on different branches, i see on git status allways all changes and have to be careful what i push on git hub branch and what not. Is this normal? I always thought branches are completely separate environments even with status changes.