Kai and Jia,
As much as I like GitHub and pull requests, I'm being slowed down by what I'm
guessing is a workflow issue. Here's the path the code is currently taking:
+------------------------+
| Apache Kerby GitHub |
+------------------------+
|
| Pull
V
+------------------------+
| Local Workstation |
+------------------------+
|
| Push
V
+------------------------+
| PennState Kerby GitHub |
+------------------------+
|
| Magic
V
+------------------------+
| Apache Kerby Git |
+------------------------+
|
| Mirror
V
+------------------------+
| Apache Kerby GitHub |
+------------------------+
The problem with this workflow is that almost every pull we make is causing
merge conflicts. I suspect (from how the code I've sent is merged into the
baseline) that you're effectively applying a patch using the contents of the
pull request during the step I've labelled "Magic". This seems like it's
harder than it should be for you - and it's certainly means we're constantly
"fudging" our code back to the baseline.
So the big question - would it be easier for you if I just attached patches to
the issues in Jira (until it's deemed worth letting me commit directly)? If
you're manually performing the step in the middle, I think Git is going to hurt
us more than it helps us.
Thanks,
Steve
--
“The mark of the immature man is that he wants to die nobly for a cause, while
the mark of the mature man is that he wants to live humbly for one.” - Wilhelm
Stekel
