k88hudson/git-flight-rules

git apply patch to the rescue (question)

Open

#214 opened on Aug 28, 2018

View on GitHub
 (5 comments) (0 reactions) (0 assignees) (2,659 forks)batch import
help wanted

Repository metrics

Stars
 (35,618 stars)
PR merge metrics
 (Avg merge 1m) (1 merged PR in 30d)

Description

Hi, I have a question: I've seen cases where a PR is really bad in terms of merging master multiple times, with commits before, in between etc. The kind of PR you want and should rebase, but it's really hard because of these merges. In this case you can generate a patch, and then apply it on a new branch, to get the exact copy of your old branch, but less messy.

Is there anything in this guide that talks about a similar method? Or should I add that in a new PR?

Contributor guide

Research direction
Review the existing guide for any mention of using patch command to clean up messy branches, then propose an addition.
Tech stack
None
Domain
documentation
Issue type
Documentation
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
1
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
Under 1 hour
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
Active
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
Clear
Prerequisites
Git
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
90