git bash rebase 1 of

Question

issue with git bash when trying to push. I've tried the following (see code snippet) to pull the latest down before pushing but I get the following error (see screen shot). How can I resolve this please? Many thanks,

code

git pull --rebase

Update

See below

Possible duplicate of [git rebase merge conflict](http://stackoverflow.com/questions/11709885/git-rebase-merge-conflict) — Andrew C, Jan 12 '16 at 22:57

score 0 · Answer 1 · answered Jan 12 '16 at 22:52

0

You are in the middle of a rebase?, try git rebase --continue.

answered Jan 12 '16 at 22:52

Alvaro Denis Acosta

785
5
20

have updated my question after trying your suggestion. – Jamie Jan 12 '16 at 22:56
Do not say what is happening, but could you give more details about what you were doing when the error become, could be useful.... – Alvaro Denis Acosta Jan 12 '16 at 23:16
i wrote some code, did git add . followed by git commit -m 'bla' and then try pulling.. That's all – Jamie Jan 12 '16 at 23:21
Do you mean specify the url? – Jamie Jan 12 '16 at 23:29
You can se if have conflict by using "git status", if found solve this with your merguetool("git merguetool"). "git status" show conflict? – Alvaro Denis Acosta Jan 12 '16 at 23:32

score 0 · Answer 2 · answered Jan 13 '16 at 00:29

0

Try this below sequence,

git commit
git clean -f
git pull --rebase
                    |
                    | # resolve conflict, use mergetool
#only when conflict | git add
                    | git rebase --continue
                    |
git push

answered Jan 13 '16 at 00:29

Sazzad Hissain Khan

33,857
26
164
227

score 0 · Accepted Answer · answered Jan 13 '16 at 00:37

First things first - that's not an error. Git is telling you that you've got 3 commits to rebase, and it's run into a conflict on the first one.

You must resolve the conflicts in the conflict, then add them to your index via git add ., then you can use git rebase --continue.

If you want to abandon the rebase and start over, use git rebase --abort.

git bash rebase 1 of

3 Answers3