Skip to content
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

Merged
merged 12 commits into from Jul 22, 2014
Merged

Add post on Xen/ARM #189

merged 12 commits into from Jul 22, 2014

Conversation

amirmc
Copy link
Contributor

@amirmc amirmc commented Jul 18, 2014

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

@amirmc amirmc mentioned this pull request Jul 18, 2014
@avsm
Copy link
Member

avsm commented Jul 21, 2014

merge conflict on this one

@talex5
Copy link
Contributor

talex5 commented Jul 21, 2014

Also, don't forget to merge this first:

amirmc#2

Updated instructions for latest mirage-xen-minios
@amirmc
Copy link
Contributor Author

amirmc commented Jul 21, 2014

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.
@amirmc
Copy link
Contributor Author

amirmc commented Jul 21, 2014

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 master branch and then merge that into my arm-blog branch. Following this, I made the relevant update to src/data.ml (which is the cause of the conflict).

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.

@talex5
Copy link
Contributor

talex5 commented Jul 21, 2014

If you get a merge conflict, you should be able to run git mergetool and sort it out in a nice GUI (on Linux anyway; I assume something similar happens on OS X).

@amirmc
Copy link
Contributor Author

amirmc commented Jul 21, 2014

Yup, that's what I did (and do). I just get paranoid because a bunch of other commits from master find their way in and then I think that as soon as I push to my fork, I'll screw up a bunch of other stuff.

This is lizard brain in full effect as I can see that the diff of files here is still as I intended. :)

@avsm avsm merged commit 0d53ff4 into mirage:master Jul 22, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants