M
M
Millerish2016-10-16 11:02:37
git
Millerish, 2016-10-16 11:02:37

Git: How to work in a team?

Good time of the day!
I'm tormenting the second day of the git.
The task is to organize the possibility of joint work on the project.
Yesterday we made an organization on github, added people there, gave access to edits. It seems to have worked.
Today is such nonsense:

[email protected] MINGW64 ~/Desktop/***/o (master)
$ git pull

delete unnecessary file
[email protected] MINGW64 ~/Desktop/***/o (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        deleted:    asd.txt

no changes added to commit (use "git add" and/or "git commit -a")

[email protected] MINGW64 ~/Desktop/***/o (master)
$ git add *

[email protected] MINGW64 ~/Desktop/***/o (master)
$ git commit -m "Чистка после обучения"
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
        deleted:    asd.txt

no changes added to commit

[email protected] MINGW64 ~/Desktop/***/o (origin)
$ git add *

[email protected] MINGW64 ~/Desktop/***/o (origin)
$ git status
On branch origin
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        deleted:    asd.txt

[email protected] MINGW64 ~/Desktop/***/o (origin)
$ git push origin master
Everything up-to-date

Why can't I commit or push? How to fix?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
O
om1058, 2016-10-16
@Millerish

To remove unnecessary files, use the git rm command. You apparently deleted the file using the OS. Try using git add with a dot and not an asterisk. A file that has already been deleted does not fall under the asterisk.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question