20 7:15 PM
To: dev@daffodil.apache.org
Subject: EXT: RE: Rebasing runtime2-2202 on asf/master
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/
ew the
commits in my "merge" pull request
(https://github.com/apache/incubator-daffodil/pull/461).
Thanks,
John
-Original Message-
From: Beckerle, Mike
Sent: Monday, November 23, 2020 1:02 PM
To: dev@daffodil.apache.org
Subject: EXT: Re: Rebasing runtime2-2202 on asf/master
I tr
, 2020 10:56:32 AM
To: dev@daffodil.apache.org
Subject: RE: Rebasing runtime2-2202 on asf/master
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
-
From: Sloane, Brandon
Sent: Monday, November 23, 2020 11:58 AM
To: dev@daffodil.apache.org
Subject: EXT: Re: Rebasing runtime2-2202 on asf/master
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 o
, John A (GE Research, US)
Sent: Monday, November 23, 2020 11:34 AM
To: dev@daffodil.apache.org
Subject: Rebasing runtime2-2202 on asf/master
Hi devs,
I've merged my pull request and landed the Daffodil C code generator on the
"runtime2-2202" development branch. I squashed my commit
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
