Patch 211 (http://patchwork.newartisans.com/patch/211/) is now Accepted.
Maintaner comment: No comment
This relates to the following submission:
http://mid.gmane.org/%3C87bp9a8a8b.wl%25n.goaziou%40gmail.com%3E
Here is the original message containing the patch:
Content-Type: text/plain;
Now that the patch is official, how do I conduct my next git pull since I
don't really want to commit my modified file in favor of the incoming from
the git server?
Sorry... never really done this part before. I have had a hard enough time
trying to learn some git basics; merging is still elusive
John Hendy jw.he...@gmail.com writes:
Now that the patch is official, how do I conduct my next git pull since I
don't really want to commit my modified file in favor of the incoming from the
git server?
If your patch comes from a temporary branch, just checkout the master
branch (~$ git
