So my colleague was editing some code on a repo, however she had not pulled some recent changes and so the software would not allow her to commit her changes.
We went into the shell and pulled the commits that she had omitted and she was able to push, the only problem is that it drew those changes into her diverged branch and attributed those commits to her.
It looks like this:
A-B-C-D-E (say D and E were by someone else)
My colleague had this:
A-B-C, and wanted to add some more on.
So she pulled D and E and pushed those changes and now it looks like this:
A-B-C-D-E-F, except that the changes D, E, and F are now from her account.
Is there away to keep her changes (F) but have the timeline revert to when D and E were attributed to someone else?
Thanks!
Graphic representation of problem:
A-B-C-D-E (most recent version of master)
A-B-C (colleague has this)
A-B-C-F (colleague makes edits) (branches hath diverged)
!ERROR! (colleague tries to commit and push)
A-B-C-D-E-F (colleague merges master into her branch)
A-B-C-D-E-F (colleague pushes)
GitHub UI now does not display changes D-E, they are lumped into a "Merge branch 'master' ..."
22 Answers
With git log check which commit is the one before the merge. Note the sha.
Then you can reset it using:git reset --hard commit_sha
Also if you want to, using your example, remove D and E then do the following. Except it will also remove F. That is, the last 3.git reset --hard HEAD~3
If you used git merge $main_branch, GitHub's UI may show some metadata making it look like you implemented the changes temporarily, but when you finally merge everything into your main branch, everything will be okay. If you are still concerned, the best option here is to simply:
Checkout a new branch from master/current_branch (wherever the changes were from the "other team member(s)", i.e. D,E commits)
git cherry-pick $your_commitsfor all 3 of your commits. The order will now be: D-E-A-B-C, or D-E-F-A-B-C if F is also on the master branch.
