|
I managed to disconnect my Git repository from the Eclipse project. What's the best way to reconnect the two?
|
#
¿
Oct 10, 2023 22:49
|
|
|
|
| # ¿ May 4, 2024 02:44 |
|
|
spiritual bypass posted:What does git status on the command line say? I have no idea how to check that. How would I go about doing that? I've only really used the functionality that's accessible through the Eclipse GUI.
|
|
#
¿
Oct 10, 2023 23:15
|
|
|
smackfu posted:I think he means type “git status” on the command line. Ok, when I do that while in the folder it shows me a giant list of files that had changed between local and remote. In Eclipse however, it's not showing the push or pull options and the project title went from project-name(branch) to just project-name.
|
|
#
¿
Oct 10, 2023 23:31
|
|
|
nielsm posted:At the very top of the git status, does it say what branch you're in? Or does it perhaps say "detached head"? Or maybe a merge or rebase in progress? I still see the branch name, I was in the middle of a merge with a bunch of conflicts when I hit the disconnect option.
|
|
#
¿
Oct 11, 2023 16:25
|
|
|
StumblyWumbly posted:It sounds like the Git part is fine, but Eclipse has set itself to ignore Git or forgot how to access git. Hope that tells you where to start looking. I got Eclipse and Git talking again and most of the merging issues cleaned up. I 100% need to learn more about Git. Thanks everyone for your help.
|
|
#
¿
Oct 11, 2023 18:56
|
|
|
|
| # ¿ May 4, 2024 02:44 |
|
|
I was able to get Eclipse and GIT talking again, and backed out the merge. I then did the rebase I should have done in the first place. Everything is looking good, other than one jsp file that lost some changes, but it looks like I should be able to redo changes easily. Thanks everyone, I list find CVS easier to use, but I expect Git will become easier over time.
|
|
#
¿
Oct 13, 2023 03:21
|
|