New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add post on Xen/ARM #189
Add post on Xen/ARM #189
Conversation
Nothing but line breaks, I promise!
Table is taken from talex5@5f24967
Change refs to Mirage to be of the form 'Mirage v1'
merge conflict on this one |
Also, don't forget to merge this first: |
Updated instructions for latest mirage-xen-minios
Merged. Y'all already have push access to my repo (FYI). Dunno why GitHub isn't sending me emails about PRs to my fork. I nearly missed your last one too. |
Conflicts: src/data.ml
Since data.ml changes with each merged PR it introduces merge conflicts with PRs that are already open. I added a placeholder for the release announcemnt in this commit to try and mitigate this.
Please merge with caution as my git-fu is weak with respect to merge conflicts. What I did here is fetch and merge into my The final commit adds a placeholder for the final release announcement so that it just has to be uncommented and edited, rather than added as new. |
If you get a merge conflict, you should be able to run |
Yup, that's what I did (and do). I just get paranoid because a bunch of other commits from This is lizard brain in full effect as I can see that the diff of files here is still as I intended. :) |
Replaces #187
Now with more atomic commits and fewer mistakes!
(line breaks make it easier to comment on the diff using GitHub's interface)
One of the posts for mirage/mirage#257