So I have 2 branches -
The first one needs to be merged into the second (let's say there are 3 commits in
develop_1 which needs to be in
I know there are merging strategies like merge and rebase.
Merge will preserve commit hashes but will create another merge commit and the git log won't be so clean in this case.
Rebase will make the git graph beautiful but will change commit hashes, so next time when I'll compare these two branches, it will still show the difference (while code changes actually are merged and actually
develop_1 branch is fully merged into
I tried to cherry-pick needed commits - hashes are changed. Patch also changes hashes.
Is there a way to do this clean - don't create a merge commit, have a straight line in the git graph, and have the git system (Github) don't show a difference between branches in the future?