Re: [GRASS-dev] git merge mess on master

> > On Tue, May 21, 2019 at 11:23 AM Bas Couwenberg > wrote: > >* On 2019-05-21 11:22, Markus Neteler wrote: > *>* > How to revert that? Of course someone had to run into this at some > *>* > point, so seems I "volunteered" to be the first :(( >

Re: [GRASS-dev] git merge mess on master

The commit "Merge pull request #14 from neteler/master" [1] is from master branch, not from dedicated branch as specified in HowToGit. I don't know for sure, but I think will get messy now when you will try to make more changes. 1) There is probably a smart way to resolve it. Something along the l

Re: [GRASS-dev] git merge mess on master

On Tue, May 21, 2019 at 7:48 AM Markus Neteler wrote: > On Tue, May 21, 2019 at 11:23 AM Bas Couwenberg > wrote: > > On 2019-05-21 11:22, Markus Neteler wrote: > > > How to revert that? Of course someone had to run into this at some > > > point, so seems I "volunteered" to be the first :(( > > >

Re: [GRASS-dev] git merge mess on master

On Tue, May 21, 2019 at 11:23 AM Bas Couwenberg wrote: > On 2019-05-21 11:22, Markus Neteler wrote: > > How to revert that? Of course someone had to run into this at some > > point, so seems I "volunteered" to be the first :(( > > rebase and force push. Thanks - we investigated further with two l

Re: [GRASS-dev] git merge mess on master

On 2019-05-21 11:22, Markus Neteler wrote: How to revert that? Of course someone had to run into this at some point, so seems I "volunteered" to be the first :(( rebase and force push. Kind Regards, Bas ___ grass-dev mailing list grass-dev@lists.osg

[GRASS-dev] git merge mess on master

Hi devs, ok, I made a mess on master: https://github.com/OSGeo/grass/commit/2604e476c54d78dc271ba189877d4d592da4e32a How to revert that? Of course someone had to run into this at some point, so seems I "volunteered" to be the first :(( sorry and help welcome, Markus _