| Instance | Branch |
|---|
Manu V. Batura manubatura
manubatura
/ gist:272032badd2948880e52135b10888d81
Created
September 3, 2021 13:54
— forked from digitaljhelms/gist:4287848
Git/GitHub branching standards & conventions
manubatura
/ git-selective-merge.md
Created
September 1, 2021 10:56
— forked from katylava/git-selective-merge.md
git selective merge
FYI This was written in 2010, though I guess people still find it useful at least as of 2021. I haven't had to do it ever again, so if it goes out of date I probably won't know.
Example: You have a branch refactor that is quite different from master. You can't merge all of the
commits, or even every hunk in any single commit or master will break, but you have made a lot of
improvements there that you would like to bring over to master.
Note: This will not preserve the original change authors. Only use if necessary, or if you don't mind losing that information, or if you are only merging your own work.
On master:
This document has been modified from its [original format][m1], which was written by Ning Shang (geek@cerias.net). It has been updated and reformatted into a [Markdown][m2] document by [Woody Gilk][m3] and [republished][m4].
When working with a remote git repository which is hosted on a third-party storage server, data confidentiality sometimes becomes