Failed to complete reboot of Git

Question

I am currently working on a branch and want to update it using the wizard. So I tried to rebase.

current branch I'm working on: crtdev

I tried to rebase like,

git checkout crtdev git rebase master // used diff mergetool to solve merge issues git rebase --continue 

Now it says: "Apply:" all the commit messages that I made in this thread "

But then what needs to be done?

I checked the repo and no changes, and when I said git status , I see that the merged files appear with the name filename.html.orig

- edit When I run git rebase --continue , I get this message git rebase --continue is not performed?

Running git status , I see this message

 # On branch crtdev # Your branch and 'origin/crtdev' have diverged, # and have 33 and 8 different commits each, respectively. # (use "git pull" to merge the remote branch into yours) 

To complete rebase, what do you need to do?

Answer 1

Completion completed.

 # On branch crtdev # Your branch and 'origin/crtdev' have diverged, # and have 33 and 8 different commits each, respectively. # (use "git pull" to merge the remote branch into yours) 

You see, he does not say anything about what is happening in the recovery phase. Babaza is over. The only thing he says is that crtdev and origin/crtdev diverge, but this is exactly what is supposed to be said after rebase.

You did rebase crtdev on master . This means that you dropped the old crtdev story and crtdev it on master . However, origin/crtdev is a separate reflection and still points to an old story. Your story now looks something like this:

 X--Y--Z...--master \ \ \ A'--B'--C'--D'--E'--F'--crtdev \ A--B--C--D--E--F--origin/crtdev 

Changes A' - crtdev the same changes (without resolving the conflict) as A - origin/crtdev , but they are new changes. Since they also contain new changes from master and commit ID in git, this is a checksum of its contents.

Now , if no one is based on origin/crtdev , you just want to infer a new story. git push -f (branch names are the same, so no arguments are needed, the full command will be git push -f origin crtdev:crtdev ).

If, however, someone already used origin/crtdev , you did the wrong thing . You must undo the results of rebase ( git reset --hard origin/crtdev ) and merge . The problem is that if another branch-based work already exists, it will remain old based on it. Although you can reinstall it in the new version, it is very easy to forget and do something wrong and very confusing for an unsuspecting colleague.