Skip to content

Change git status output to reflect no previous commit#1605

Merged
das-g merged 1 commit intoDjangoGirls:masterfrom
nimasmi:pre-first-commit-status
Jan 29, 2020
Merged

Change git status output to reflect no previous commit#1605
das-g merged 1 commit intoDjangoGirls:masterfrom
nimasmi:pre-first-commit-status

Conversation

@nimasmi
Copy link
Copy Markdown
Contributor

@nimasmi nimasmi commented Oct 21, 2019

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.

@nimasmi nimasmi requested a review from a team as a code owner October 21, 2019 10:18
@magul
Copy link
Copy Markdown
Member

magul commented Oct 21, 2019

Hi, thanks for your contribution here!

Unfortunately, there are some conflicts to be resolved here.

@das-g
Copy link
Copy Markdown
Member

das-g commented Oct 21, 2019

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
Copy link
Copy Markdown
Contributor Author

nimasmi commented Oct 21, 2019

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 nimasmi force-pushed the pre-first-commit-status branch from ca286c9 to c878022 Compare October 21, 2019 14:38
@nimasmi
Copy link
Copy Markdown
Contributor Author

nimasmi commented Oct 21, 2019

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.

@das-g das-g merged commit 856ea2e into DjangoGirls:master Jan 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants