Hi Toon,
So why do "we" want to use rebase ? Wouldn't it be more "natural" to
merge master into your branch, and work from that ?
If you can tell me how to do this, sure :-)
Best regards
Thomas
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
branch. Example:
# Just in case, see which is your old local branch.
$ git branch
# Create a new local tracking branch
$ git checkout -b fortran_unsigned-20240809
origin/devel/fortran_unsigned
$ git rebase origin/master
$ gitk -n1000
I tried that, with te same result
, see which is your old local branch.
$ git branch
# Create a new local tracking branch
$ git checkout -b fortran_unsigned-20240809
origin/devel/fortran_unsigned
$ git rebase origin/master
$ gitk -n1000
I tried that, with te same result:
warning: skipped previously applied commit
r local branch. Example:
> >
> ># Just in case, see which is your old local branch.
> >$ git branch
> >
> ># Create a new local tracking branch
> >$ git checkout -b fortran_unsigned-20240809 origin/devel/fortran_unsigned
> >$ git rebase
# Create a new local tracking branch
$ git checkout -b fortran_unsigned-20240809 origin/devel/fortran_unsigned
$ git rebase origin/master
$ gitk -n1000
I tried that, with te same result:
warning: skipped previously applied commit a6399bb27b3
hint: use --reapply-cherry-picks to include
/devel/fortran_unsigned, then you
> > are attempting to merge pre-rebase history with post-rebase history.
> > In such case conflicts are expected. Don't pull the remote devel
> > branch.
>
> Hmm... but I already did. And, following other people's advice,
>
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
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
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
I get
...
warning: skipped previously applied commit a6399bb27b3
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "
Ok and thanks.
On Fri, Aug 9, 2024, 7:33 AM Andre Vehreschild wrote:
> Ping!
>
> And the last ping in the series. I have a "bigger" patch in the queue and
> want
> the pending ones done beforehand.
>
> Regtested ok on x86_64-pc-linux-gnu / Fedora 39. Ok for mainline?
>
> - Andre
>
> On Mon, 22 J
Ping!
And the last ping in the series. I have a "bigger" patch in the queue and want
the pending ones done beforehand.
Regtested ok on x86_64-pc-linux-gnu / Fedora 39. Ok for mainline?
- Andre
On Mon, 22 Jul 2024 16:35:28 +0200
Andre Vehreschild wrote:
> Hi all, hi Paul,
>
> you asked me to h
Ping!
@Paul, you already had a look at this patch, but I made some changes. Or they
ok?
- Andre
On Fri, 19 Jul 2024 13:26:21 +0200
Andre Vehreschild wrote:
> Hi Paul,
>
> thanks for the review.
>
> > While I realise that this is not your doing, should we not
> > check DECL_LANG_SPECIFIC ()) be
Ping!
On Wed, 17 Jul 2024 15:15:51 +0200
Andre Vehreschild wrote:
> Hi all,
>
> attached patch fixes an ICE in coarray code, where the coarray expression
> already was a pointer, which confused the compiler. Furthermore have I removed
> a rewrite to a caf_send late in the trans-phase. This is no
Ping!
On Wed, 17 Jul 2024 15:11:33 +0200
Andre Vehreschild wrote:
> Hi all,
>
> and the last ping.
>
> Regtests ok on x86_64-pc-linux-gnu / Fedora 39. Ok for mainline?
>
> Regards,
> Andre
>
> On Thu, 11 Jul 2024 16:05:09 +0200
> Andre Vehreschild wrote:
>
> > Hi all,
> >
> > the attached
15 matches
Mail list logo
