How can I change the git pull strategy (rebase / merge / none) in eclipse?
It seems I can only set it when I check out a new branch but can't change it afterwards.
This seems really odd or is it not allowed to change the pull strategy on an existing branch?
In its default mode, git pull is shorthand for git fetch followed by git merge FETCH_HEAD . More precisely, git pull runs git fetch with the given parameters and calls git merge to merge the retrieved branch heads into the current branch. With --rebase , it runs git rebase instead of git merge.
Right-click your project and select Team → Branch to create new branches or to switch between existing branches. You can also switch branches in the History view.
fetch from upstream does not overwrite anything in the working tree. But pull will, but it will not completely destory work, it will create a conflict to manually merge if it can not do it automatically. I suggest if you are unsure, ensure you working tree is clean, and everything commited.
If Configure Branch is not available, update EGit to at least 2.0, or use the nightly update site.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With