eclipse - How do I force push local project folder (updated) to remote branch of same folder but slightly outdated?

Question

I am using Eclipse with eGit plugin, my problem is: I had to work in college today on project without git (Downloaded as project from Bitbucket), worked on it, did quite a lot of updates, about 600 new lines in different files so manual merging would be very bad. So I have right now an offline version (the newer one) and I have online branch version which is older. How can I force update online version with offline version?

Answer 1

您可以简单地压缩您的离线项目，将其解压缩到您将首先清空的本地工作树上。

Git 将检测所有更改，所有添加或删除的文件。
简单地：

git add -A
git commit -m "new commit"
git push.

您发布（推送）一个新的提交，它将代表您的所有更改。
这里不需要合并。