Thread: "Gitting" Git
View Single Post
Old 09-05-2019, 03:51 PM   #2
FlamesPuck12
First Line Centre
 
Join Date: Apr 2007
Exp:
Default

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.
FlamesPuck12 is offline   Reply With Quote
The Following User Says Thank You to FlamesPuck12 For This Useful Post: