F
F
Freud's cat2019-07-10 23:24:11
git
Freud's cat, 2019-07-10 23:24:11

Surely it has already been asked more than once, but still, how?

There is a project on github. There is the same project on the computer, but on another one, different from the one from which the project was pushed to the github, and in addition, a lot of things have been modernized in this project, new files have been created.
How to continue working on the project on this computer and then upload the changes to the repository?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
J
jcmvbkbc, 2019-07-10
@medbrat69

First, add the remote to the repository on another computer:
If the history on github matches the local history, just shorter, then you can immediately push:
If not, you need to download and merge:

git fetch <имя remote> <имя ветки>
git merge <имя remote>/<имя ветки>
<магия разрешения конфликтов>

after which you can push back.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question