Displaying 1 result from an estimated 1 matches for "fake_commit".
Did you mean:
fail_commit
2018 Nov 29
0
[PATCH 0/9] drm: remove deprecated functions
...uff you've just pushed. Or if someone forgot to fix up their mess.
> > What was the conflict?
>
> dim push-branches was complaining that one of the commits was
> missing the proper committer sign-off, it was the bottom commit under
> mine (IIRC "drm/atomic-helper: WARN if fake_commit->hw_done is not
> completed as expected")
> and dim update-branches seemed to rebase and fix up my patches
> and then everything was fine.
This sounds like you (or dim?) accidentaly amended that commit (which
changes the committer and results in the warning), and a rebase would
in...