3 ms·
What? No. If Sally has already merged her commits into master, then those commits will never look like they've come from your branch. If i'm misunderstanding t
by twic 14y ago
What? No. If Sally has already merged her commits into master, then those commits will never look like they've come from your branch.
If i'm misunderstanding this, then a worked example would be a really great way of clarifying it.
- btipling 14y agoI believe you are wrong. The merge commit would make it look like her changes were in your branch. Try it out with a new repository. Create a new repo. Add some commits. Create Sally's branch, add commits to her branch. Create your branch from master, add some commits to your branch. Merge Sally's branch into master. Merge the updated master into your branch. Add some commits to your branch. Merge your branch into master. Revert your merge, and see, Sally's changes are no longer in master.
- deleted 14y ago[deleted]