CODEWITHSUNDEEP
javaeclipsespringgit
dieTasse
dieTasse

Reputation: 55

Merge local Java project to existing git repo

I have checked out the source from a git repo, because i was forced to use someone elses svn repo for a while, and now i want to re-check in my source in the original git repo. We are using eclipse (STS) for the project. The perfect solution would be to check in the changes made during this time into a new branch and then putting back together everything. Does anyone know how I can do this?

Upvotes: 2

Views: 648

Answers (1)

VonC
VonC

Reputation: 1323993

If you have your changes made in one folder, you can use that folder as a working tree in order for your git repo to detect and add those changes.

cd /path/to/git/repo
git --work-tree=/path/to/other/repo status
git --work-tree=/path/to/other/repo add .

Then you can commit and push normally from your git repo now updated with the latest changes from the other repo.

Note: that is a command-line solution: once done, you can resume working in Eclipse.

Upvotes: 2

Related Questions