The merge went fine and everything looked good until I created the merge pull
request. Then GitHub said the apache/incubator-daffodil repository will not
allow a merge commit to be created and the asf/runtime2-2202 branch cannot be
rebased due to conflicts. I have decided I will have to skip t
I tried this, checked out runtime2-2202 then git pull asf master. There are
like 5 conflicting files, but looks pretty manageable.
I am looking forward to working on runtime2 more soon.
From: Interrante, John A (GE Research, US)
Sent: Monday, November 23, 2020
Yes, that makes sense and I believe a merge would actually work. When I have
time later I'll start over, run a git merge asf/master instead of a git rebase
asf/master, fix conflicts again, submit a pull request, and it shouldn't have
any conflicts this time.
-Original Message-
From: Sl
Since runtime2-2202 is such a long-lived branch, it might be worth considering
a workflow where we merge master into it instead of rebasing onto master.
Once we are ready to actually put runtime2 into master, we can do a
squash+rebase then.
From: Interrante, Joh
Hi devs,
I've merged my pull request and landed the Daffodil C code generator on the
"runtime2-2202" development branch. I squashed my commits to one commit and
merged my commit first before trying to rebase runtime2-2202 to get the latest
changes in the main branch. My thinking is that we'll
