Quote:
Originally Posted by FlamesPuck12
Based on the tree that you posted, it looks like there are 2 commits that are different on the develop branch (compared to the orange branch). You said you created the latest commit on green but someone else created the first green commit? Is that first green commit a new feature commit or is that the clean up commit (perhaps squashed commit of the tree on the left)?
Unless that green commit is equivalent to the orange and blue tree on the left, it looks like your develop branch does not contain everything on orange/blue tree.
You could potentially merge those into the develop branch but I would prefer to rebase the 2 green commits on top of the orange and reset the develop branch to that.
|
So it turns out that I was right in noticing the develop branch wasn’t actually up to date (they thought it was up until I pushed to it and showed them). So I’m at least relieved that I’m not completely on a different planet with this stuff.
The part I need to work on is my approach to fixing it. I was suggesting all these crazy merge scenarios, and I never once thought of a rebase.