I have a git tree that looks like this:
Because of the review tool we use, we alternate the changes, not merge them. This leaves us with some logical duplicates, the branch of which I then simply delete. For example, the change in the file below ssl_tests "Modification: Name change ..." can also be seen in dev.
Now, perhaps this is a lack of understanding on my part of the cherry pick, but these commits have different hashes, and so the different commits are right? Although they are logically the same.
However, when I switch to rebas ssl_tests on dev, git manages to find out that those that chose the cherries are upstream, and then only reinstall the "New Feature: Unit Tests ..." command from ssl_tests.
, git, ! , ! , , , git , , ?
!