Changes between Version 1 and Version 2 of GitRejectedPatch

Timestamp:

Jul 30, 2013, 12:01:57 PM (11 years ago)

Author:

abeccati

Comment:

cherry-pick cleaning master

GitRejectedPatch

@@ -147 +147 @@
 ----
 
-Final note: conflicts can always happen, it's not your fault.[[BR]]
+== 2A. Cherry-pick cleaning local master ==
+
+Assuming (use export to set them in bash):
+{{{
+  rejcomm=sha-of-your-rejected-commit 
+  lastgood=sha-before-your-rejected-commit 
+}}}
+
+{{{
+#branch from last good commit
+git checkout -b re-patch $lastgood
+
+#cherry-pick rejected patch to be fixed, without committing it
+git cherry-pick $rejcomm --no-commit
+
+#Amend the files, stage them with git add, then commit and create the new patch
+geany fileToAmend
+git add fileToAmend
+git commit -m "old message /vN" #with N=2 to be incremented just in case
+git format-patch HEAD^ # Works only with single last commit
+
+# Now you are left with the rejected patch still committed on the master
+# and the "hopefully to be accepted" patch in your temporary branch
+# A practical way to avoid merge conflicts and let you merge your branch
+# and pull from master is to:
+
+# Revert the rejected patch on your master
+git checkout master
+git revert $rejcomm
+
+#merge your re-patch branch (should go without conflicts, if not see note)
+git merge re-patch
+}}}
+
+ * NOTE: If you have more than one related commits (depending on) to the reverted patch (perhaps also to be amended), you can cherry pick also these to the branch and revert them in reverse order on the master.
+ * 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.
+
+== Final note ==
+Conflicts can always happen, it's not your fault.[[BR]]
 https://duckduckgo.com/?q=git+rebase+conflict