Hello all,
It seems there is a single commit different at the fork: 7b98c6f57a
It looks like someone has pushed a rebase on already published commit.
As there are already commited changes after the fork and the merge,
the branch is published as is and has already been fetched by other person,
I st
2016-12-21 20:44 GMT+01:00 Marko Käning :
> I agree with Mojca, it looks messy now!
> We better fix it fast.
> Someone with admin access to the repo should be able to fix this if we don’t
> wait too long.
+1
It helps. If PR is outdated and then you do git pull from maser instead of
rebasing on top of it and force push into your branch you'll see all this
duplicated commits in the PR.
And it has nothing to do with clicking any buttons. I'm taking about reviewing
PR and not about merging it. You can
On 21 December 2016 at 22:38, Ivan Larionov wrote:
> One of the ways to avoid it is to review things you're going to merge. And
> one of the easiest ways to do it is to open a PR on github where you can
> clearly see which commits you're going to merge.
That doesn't necessarily help. The author ca
One of the ways to avoid it is to review things you're going to merge. And
one of the easiest ways to do it is to open a PR on github where you can
clearly see which commits you're going to merge. I was similar errors
multiple times when people do `git pull` instead of `git pull --rebase` and
it wa
I agree with Mojca, it looks messy now!
We better fix it fast.
Someone with admin access to the repo should be able to fix this if we don’t
wait too long.
I think we should somehow make sure that such merged branches cannot be pushed
to the main repo, if rebasing is our policy for all committers
On 21 December 2016 at 18:44, Ryan Schmidt wrote:
> On Dec 21, 2016, at 04:41, Andrea D'Amore wrote:
>
>> While trying to push a small change (shell/xonsh) I managed to rebase
>> AND merge the about 300 commits since my previous update,
>> as a results those 300 commits in master now are "duplicate
On Dec 21, 2016, at 04:41, Andrea D'Amore wrote:
> While trying to push a small change (shell/xonsh) I managed to rebase
> AND merge the about 300 commits since my previous update,
> as a results those 300 commits in master now are "duplicated".
>
> The files in master are unaltered, except for
On 21 December 2016 at 17:33, Rainer Müller wrote:
> On 2016-12-21 16:39, Mojca Miklavec wrote:
>> On 21 December 2016 at 12:38, Rainer Müller wrote:
>>> On 2016-12-21 11:41, Andrea D'Amore wrote:
While trying to push a small change (shell/xonsh) I managed to rebase
AND merge the about 3
On 2016-12-21 16:39, Mojca Miklavec wrote:
> On 21 December 2016 at 12:38, Rainer Müller wrote:
>> On 2016-12-21 11:41, Andrea D'Amore wrote:
>>> While trying to push a small change (shell/xonsh) I managed to rebase
>>> AND merge the about 300 commits since my previous update,
>>> as a results thos
I've created a clean branch on my fork. If you want to clean the
history, first cancel branch protection in repository's settings, then do
git remote add https://github.com/l2dy/macports-ports.git
git fetch --all
git checkout master
git reset --hard l2dy/fix-history
git push -f
to reset mas
On 21 December 2016 at 12:38, Rainer Müller wrote:
> On 2016-12-21 11:41, Andrea D'Amore wrote:
>> While trying to push a small change (shell/xonsh) I managed to rebase
>> AND merge the about 300 commits since my previous update,
>> as a results those 300 commits in master now are "duplicated".
>>
On 2016-12-21 11:41, Andrea D'Amore wrote:
> While trying to push a small change (shell/xonsh) I managed to rebase
> AND merge the about 300 commits since my previous update,
> as a results those 300 commits in master now are "duplicated".
>
> The files in master are unaltered, except for the actu
While trying to push a small change (shell/xonsh) I managed to rebase
AND merge the about 300 commits since my previous update,
as a results those 300 commits in master now are "duplicated".
The files in master are unaltered, except for the actual portfile I
was pushing, but the history is now mes
14 matches
Mail list logo
