Changes between Version 3 and Version 4 of GitRejectedPatch

Timestamp:

Mar 21, 2014, 5:21:01 PM (10 years ago)

Author:

Piero Campalani

Comment:

add Alan's workflow from GitPatchDoesNotApply

GitRejectedPatch

@@ -151 +151 @@
 ----
 
-== 2A. Cherry-pick cleaning local master ==
+=== 2A. Cherry-pick cleaning local master 
 
 Assuming (use export to set them in bash):
@@ -188 +188 @@
  * NOTE2: Still not know what to do if the dependent commits are from other authors (should not happen since the patch was not accepted) but I guess the method still applies as long as you add a patch taking care of such dependent commits.
 
+
+== 3. Brute force procedure
+
+The following procedure ensures resolution even if you did not keep the patch branch in your local repo or would have a complex rebase due to subsequent local patches. 
+Using a branch for each patch and rebasing it has to be preferred as a best workflow.
+
+   * clone the repository from scratch (optional, also a new branch should do)
+   * apply the patch manually (with '''`--reject`''' option)
+   * `git apply --reset patch_file`
+   * fix manually the rejected files
+   * You can find them by their extension (`.rej`)
+   * then generate a new patch
+
+I think the only problem with this approach is that such patch won't be into your main working copy (existing repo), hence a clash might occur at next `git pull`. 
+
 == Final note ==
 Conflicts can always happen, it's not your fault.[[BR]]