Contents tagged with merge

  • Stories From The Git Frontline (or, how to revert / undo a merge that's already pushed)

    So, this happened: was working on a different branch did a merge back into master too early mistook git revert for "take me back to this point" instead of what it actually does (undo one specific commit) The tree then ended up looking like: a revert i don't actually mean to have a merge of a bunch of stuff i dont want a previous good merge before my merge the commit which i mistakenly … more

  • 1