Re: git help: fortran_unsigned branch

2024-08-10 Thread Thomas Koenig via Gcc
Am 10.08.24 um 10:17 schrieb Thomas Schwinge: Hi! I'm not sure I understand what actually the issue is, but: On 2024-08-09T20:00:42+0200, Thomas Koenig wrote: I have managed to bring the fortran-unsigned branch into a state where First, I see that the upstream devel/fortran_unsigned branch

Re: git help: fortran_unsigned branch

2024-08-10 Thread Thomas Schwinge
Hi! I'm not sure I understand what actually the issue is, but: On 2024-08-09T20:00:42+0200, Thomas Koenig wrote: > I have managed to bring the fortran-unsigned branch into a state where First, I see that the upstream devel/fortran_unsigned branch does contain (a) your development work, and (b)

Re: git help: fortran_unsigned branch

2024-08-09 Thread Thomas Koenig via Gcc
Am 09.08.24 um 21:57 schrieb Dimitar Dimitrov: You are redoing the rebase again. So it is expected to get the same warnings. I need to get the changes from master into my branch, or else things will not compile due to changes in master. But it seems that this is no longer possible, thanks to

Re: git help: fortran_unsigned branch

2024-08-09 Thread Dimitar Dimitrov
On Fri, Aug 09, 2024 at 09:40:08PM +0200, Thomas Koenig wrote: > Am 09.08.24 um 21:17 schrieb Dimitar Dimitrov: > > > I assume you reset your local branch? The branch on the server does not > > seem to be affected. I suggest to rebase the remote branch using > > another local branch. Example: >

Re: git help: fortran_unsigned branch

2024-08-09 Thread Thomas Koenig via Gcc
Am 09.08.24 um 21:17 schrieb Dimitar Dimitrov: I assume you reset your local branch? The branch on the server does not seem to be affected. I suggest to rebase the remote branch using another local branch. Example: # Just in case, see which is your old local branch. $ git branch #

Re: git help: fortran_unsigned branch

2024-08-09 Thread Dimitar Dimitrov
On Fri, Aug 09, 2024 at 08:43:38PM +0200, Thomas Koenig wrote: > Hi Dimitar, > > > On Fri, Aug 09, 2024 at 08:00:42PM +0200, Thomas Koenig via Gcc wrote: > > > Hi, > > > > > > I have managed to bring the fortran-unsigned branch into a state where > > > it can no longer be rebased. When I do a > >

Re: git help: fortran_unsigned branch

2024-08-09 Thread Thomas Koenig via Gcc
Hi Dimitar, On Fri, Aug 09, 2024 at 08:00:42PM +0200, Thomas Koenig via Gcc wrote: Hi, I have managed to bring the fortran-unsigned branch into a state where it can no longer be rebased. When I do a $ git rebase master It's unknown what is the state of your local master branch. So I would ad

Re: git help: fortran_unsigned branch

2024-08-09 Thread Dimitar Dimitrov
On Fri, Aug 09, 2024 at 08:00:42PM +0200, Thomas Koenig via Gcc wrote: > Hi, > > I have managed to bring the fortran-unsigned branch into a state where > it can no longer be rebased. When I do a > > $ git rebase master It's unknown what is the state of your local master branch. So I would advise