So there’s two developers on my project, me and the other guy. The other guy is doing most of the coding and I wanted to use Github to store our code. This lead to the install of Egit for eclipse. We’re both working on Windows.
He is able to do commits and pushes to the remote repository no problem. I can see that changes have been made with the little down arrow thingy in the project name (after I’ve done a fetch).
I cannot do a merge. I get Checkout conflict: Your local changes to blah blah blah.
I haven’t touched the code. Does anyone know how I might do a merge force from within the Eclipse plugin?
I also wouldn’t hate answers to the following question:
What is the difference between Commit, Push to Upstream, Fetch from Upstream, Fetch, Push, Merge and Synchronize workspace.
If you haven’t edited the code and are running into merge conflicts when pulling right away, it’s most likely because you’ve versioned files which your IDE is automatically modifying. This probably includes local, user-specific configuration files that are not actually part of the source code.
You probably want to familiarize yourself with git itself first. All of those, except for “synchronize workspace”, are git commands, and you can find the documentation for them on the website.