Eclipse - Merge tool override previous commits
问题 I'm using Eclipse 2019-12 working with Git using Eclipse UI only If I commit to master before pull previous commits I can't push my commit to server I used Team -> Merge Tool (Merge option was disabled) I merge the changes (shows some files) and then push to upstream Expected: all commits are merged Actual: previous commits weren't added to master Is using Merge tool wrong for conflict? can I use rebase without losing any commits? can't pull previous commits after commit 来源: https:/