Understanding pycharm commit log for hard reset before merge incorrectly

Here is the situation tree

enter image description here

Everything related to the bokeh branch section is fine. "Works with python3 and ubunutu" commits, I want a hard reset header for the Bokeh branch.

I cannot switch to the Bokeh branch because Git Branches does not have a validation option. The branch I am on is apparently the “Merge Wizard”, as you can see in the lower right corner

I did the wrong merge. Ultimately, I want to check out the version of "Works with python3 and ubunutu", but pycharm will not let me until merge conflicts are resolved. I need to look at this revision to compare the results with the code from the most recent commit.

+4
1

, , .

git merge --abort

+1

Source: https://habr.com/ru/post/1621377/


All Articles