Re:Flight rules for Git
by krinchan on Tuesday October 16, 2018 @10:50PM
(#18235749)
Same really. I'm considered a "git expert" at work and the extent of my expertise is:
"This merge went completely sideways. But I haven't pushed anything."
"Okay, do this to export the commits you made as a patch file. Move those somewhere safe. Delete your repo. Reclone. Apply the patches. Commit. Start merge over again."
Also I can recognize whatever that weird error message is that means someone deleted a file in one branch and I edited it in another. Usually results in just "git rm (file); and git merge --continue".
"This merge went completely sideways. But I haven't pushed anything."
"Okay, do this to export the commits you made as a patch file. Move those somewhere safe. Delete your repo. Reclone. Apply the patches. Commit. Start merge over again."
Also I can recognize whatever that weird error message is that means someone deleted a file in one branch and I edited it in another. Usually results in just "git rm (file); and git merge --continue".