On 11/06/20 06:41 -0500, Richard Shaw wrote:
I'm working on updating fldigi to build better in the Fedora MinGW
environment and I have commit access to the git repo (at least access to
create my own branches).
I have a branch called "tmp/mingw" and I've made several commits. I know
other
On Thu, Jun 11, 2020 at 11:46 AM Miro Hrončok wrote:
> On 11. 06. 20 13:41, Richard Shaw wrote:
> > remote: *** Your commits contain a bad merge:
> > remote: *** 47456e93 2020-06-10 Merge branch 'master' into
> tmp/mingw***
> > Please rebase on top of this commit in tmp/mingw:
> > remote:
On 11. 06. 20 13:41, Richard Shaw wrote:
remote: *** Your commits contain a bad merge:
remote: *** 47456e93 2020-06-10 Merge branch 'master' into tmp/mingw***
Please rebase on top of this commit in tmp/mingw:
remote: *** a596a086 2020-06-10 Initial commit for MinGW 64bit builds.
This
