Displaying 2 results from an estimated 2 matches for "ad03b0b8".
2019 Mar 21
1
[cfe-dev] [lldb-dev] [GitHub] RFC: Enforcing no merge commit policy
...to a
previous release) the patch and eventual merge conflict resolution will
appear as a different commit, with a different identifier.
Cheers,
.Andrea
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20190321/ad03b0b8/attachment.html>
2019 Mar 20
5
[cfe-dev] [lldb-dev] [GitHub] RFC: Enforcing no merge commit policy
Excuse my ignorance (I'm not great with Git) but how would it differ for workflows of people
who use a Git repository for local work but still use `svn up + patch + svn commit <list of
files>` to actually land post CR or for NFC patches, while resolving conflicts during a
pull into a local (non-trunk) branch manually, after the eventual full switch to GitHub?
I'm aware that SVN