Co-development Eslipse management of MAVEN projects is always a conflict, so it is recommended to download a git to manage the development
First download good git, specific to where to download Baidu will die ah? Yes..
Then Git clone fills in the address. is to develop a git project address,
Then git settings to configure
Tick the required menu items: Main Pull (Download item merge), push (upload Item), Commite (uploaded to local), git add add
So you can right-click on the menu you need.
The project submission process, general add (before this file is only added modifications will not need add)->commite->pull->push
ADD
I changed the project to add the project file.
Commit
Status shows if you modified and lines add &lines remove
Double-click to see where the changes are
Of course, if you feel that you do not need to change, or you accidentally moved the file. You can restore your code by having a user left block in the upper-right corner.
Pull push your code before you have to pull it. Otherwise it is very easy to conflict, conflict is very troublesome, you not only take the time to deal with their own conflicts, your team will take the time to deal with your conflict
Pull often appear when your code is not commit, often these files are you modified (only to local), others have changed
So when you pull a hint that you're not submitting, you only have two ways of handling it, and it's a commit.
1, right-click on the file revert is to undo the changes you place (you do not want to upload your code)
2. Submit your documents (you think your code is valid).
Last push if you can pull the successful pull
General push is no problem.
Manage MAVEN projects with git under Eslipse