Re: [dev] Merge process

2016-10-11 Thread anthony shaw
Hi Eric, The downside is that we'll get the git commit history from the original authors without the ("with xxx") signoff tag, but instead that's replaced with a merge commit saying "merging GITHUB-123 by blah", the merge commit has the parents of the original commits and as long as we fetch the r

Re: [dev] Merge process

2016-10-11 Thread Eric Johnson
I agree that git-am can be a pain. What I like about using it though, is that history is more forthcoming about original author versus us showing up all the time. """ commit 065d1919d8cd1e651b92af6220b1408437b07563 Merge: 4897933 0d1a9d2 Author: Anthony Shaw Date: Wed Oct 12 09:41:47 2016 +110

[dev] Merge process

2016-10-11 Thread anthony shaw
Hi, Our PR process (applies to committers but anyone else is welcome to weigh in) says to download the patch file from GitHub and apply the patch using the `git am` command. I find git am to be so fragile, typically I use the --3way flag to help it try and resolve conflicts but normally is just s