DjangoGirls / tutorial

This is a tutorial we are using for Django Girls workshops
http://tutorial.djangogirls.org/
Other
1.53k stars 1.86k forks source link

Change `git status` output to reflect no previous commit #1605

Closed nimasmi closed 4 years ago

nimasmi commented 5 years ago

The output from git is given as though a first commit has already been made. This corrects it to show that no commits have been made yet.

magul commented 5 years ago

Hi, thanks for your contribution here!

Unfortunately, there are some conflicts to be resolved here.

das-g commented 5 years ago

Isn't this a duplicate of pull request #1578 (which fixed issue #1570 for English)?

That pull request #1578 has already been merged is probably also the reason that there are merge conflicts with this pull request here.

nimasmi commented 5 years ago

That might explain it. I pulled from upstream on Saturday, but hadn't seen the changes in #1578. I'll pull again and check.

nimasmi commented 5 years ago

I have rebased and force-pushed. Hopefully it's okay now. My editor has added a couple of newline characters at the end of files. I hope that's okay.