Stephan van Hulst wrote:... it appears that you seem to be confused that your push is rejected after a rebase.
This is what makes things clear. Thank you. I feel bad that I have not even explored this rebase option after years of using git for a merged based workflow. My thought process was that it should have worked as a simple push. I stand corrected.
Stephan van Hulst wrote:This is normal and expected behavior. A rebase performs history rewriting. Essentially you take old commits and replace them with new commits. A central theme in Git is that no matter what you do, you never lose history. Rebasing goes against that principle.
Stephan van Hulst wrote:Have you performed the "Git game" yet?
Stephan van Hulst wrote:Merge-based workflows should be the norm. Rebasing is great when you're working on a small feature or bugfix branch by yourself, but as soon as more than one person works on the same branch, rebasing should no longer be used on pushed commits.
I have mixed feelings about this. I think the commands are a bit confusing and I've liked the UI for merge based workflow. But, I will try and learn the commands soon.
Tim Holloway wrote:Truthfully, I tend to avoid using the IDE to do complex and abstruse VC operations...