Eclipse Git - 在拉取前防止提交

Question

We use Eclipse with Git and we have issues when committing before pulling

Currently we don't use pull request, but direct pushes to the main/master branch. and failing to (commit and) push because of old commits not pull causes difficulty to merge commits later.

Can we ensure/prevent commit(/push) before pulling latest commit(s)?

ie can we execute in atomic operation pull and commit (and maybe push) instead of just commit?

Or alternatively can we do a automatic rebase before push?

Answer 1

You can't really prevent someone to commit before pulling, and given git distributed nature, it doesn't make much sense : even when you pull, you have no way to know if the remote has been updated by someone else in the next second.

Any git workflow has a part that says : if my local changes are not up to date with the remote changes, I have to decide what to do with the remote changes (integrate them ? squash them ?) before pushing.

I think you need to clarify your issues in your other questions, this is how you will fix your workflow.

Answer 2

Here's what I would like: a checkbox in Eclipse preferences so that when I try to do a local commit there will be a check if my local repo is up to date.

So... I make some changes and try to do a local commit. Eclipse does a fetch and since there has been a change I get a warning that reads "Project not up to date with origin. Continue commit or cancel?"

Most likely I cancel, pull in the changes, and then try my commit again.