How to combine two significant changes in git?

Question

GitHub

Explain how to be in a situation: a site on 2 computers, at home and at work.
At work, I made significant changes, but I forgot to upload it to github.
At home, he also made significant changes.
How now to connect them without losing data?

Answer 1

On one push on the other pool with a merge or rebase

Answer 2

On both computers - commit. Then on one - push. On the second - pull, resolve conflicts, commit, push. Then on the first - pull. In theory, there will be no conflicts.
You can still solve the issue through brunches, but in fact there will be the same thing.