KnowledgeHub
Questions
Tags
Users
Search
Alex Rivera
|
Logout
Edit Question
Title
Body
After some pulling, merging and conflict resolving, my GIT is stuck. This is what I tried to do (with EGit) on the main project: "Pull" returns "cannot pull into a repository with state: merging_resolved" "Fetch from upstream" returns "No ref to fetch from GeniusWebSocket - origin - everything up to date." "Merge" is greyed in the menu. "Commit" returns "Commit/amend not possible...". "Push to upstream" returns "rejected - non-fast-forward". "Add to index" does nothing. Near the project title, I see [Merged master up-arrow 1 down-arrow 1]. $ git status # On branch master # Your branch and 'origin/master' have diverged, # and have 1 and 1 different commit each, respectively. # nothing to commit (working directory clean) How can I proceed?
Tags (comma-separated)
Save Edits
Cancel