B
B
BonBon Slick2018-10-24 14:14:32
git
BonBon Slick, 2018-10-24 14:14:32

Do big rebases often fall in the middle?

Prmierno after 15 + git rebase --continuecommands, knocks out such a message

Applying:  450 merge request improvements. UserTrait, test, twigs etc
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

There are no changes, there are no conflicts in the Version control, there are no any in the code
<<< HEAD
 или 
>>>

When I try to git --skipskip the current alleged conflict, and give the one that already was, I solve the conflict that I already solved earlier, and then again, as if in a loop, there are conflicts, but they are not there, --skip returns to the same conflict, and so on in a circle , conflict 1, then the 2nd conflict-free, then again the 1st, all the same.
What's a glitch?
For the 4th time I'm doing an abortion and restarting PhPStrom, it doesn't work to merge, manually looking at conflicts indicates some kind of garbage
grep -H -r "<<<<<<< HEAD" /var/www/advire/oppasland/
/var/www///vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.2.inc:<<<<<<< HEAD
/var/www///vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.2.inc.fixed:<<<<<<< HEAD
/var/www///vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.inc:<<<<<<< HEAD

I make a commit and try to push, but the rebase is not over yet, even if some files are changed, there will be no push while the rebase is in progress.
There are many conflicts, the rebase is long, every time after 15 minutes of the procedure it is sad to have an abortion.
Who had? How to fix?
I'm not sure what caused it, whether the git is buggy somewhere, or Storm does not want to issue conflicts.
git status
rebase in progress; onto ыфваывава
You are currently rebasing branch '450 on 'фывйцуфыв'.
  (all conflicts fixed: run "git rebase --continue")

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        .idea/composerJson.xml
        .idea/dataSources.local.xml
        .idea/dataSources.xml
        .idea/dataSources/
        .idea/misc.xml
        .idea/sonarlint/

After eliminating conflicts in the left package, the conflicts were of the form
<?php
$var = [];

// The following function has a simulated git conflict for testing.
// This is not a merge conflict - it is a valid test case to test handling of arrays without associated closer.
// Please do not remove.
function test()
    {
        $arr = array(
            'a' => 'a',
<<<<<<< HEAD
            'b' => 'b'
=======
            'c' => 'c'
>>>>>>> master
        );
    }

Now it does not output any conflicts to the console at all, even with a manual check, but the rebase cannot be continued, because it says that there are conflicts.

Answer the question

In order to leave comments, you need to log in

1 answer(s)
A
aol-nnov, 2018-10-24
@BonBonSlick

this "glitch" is called a merge conflict, solved by manual intervention. then git rebase --continue. everything is written there, in general.
Here you need an English-Russian dictionary. and it becomes clear what's what. if you are sure that something else has already introduced the same changes, do git rebase --skip and move on.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question