On 08/24/2009 09:48 AM, Vreman, Peter wrote:
Please find attached 2 patches for the following features:
- Fix the showing of Netboot enabled and make it a checkbox. Read-only currently, might be changed in the future to attach an action
- Enable the sorting of the tables
- Show arrows on which column is sorted

Currently headers of the tables don't show nice with the colors of the links. My CSS knowledge is too little to fix this.

Peter


This e-mail and any attachment is for authorised use by the intended recipient(s) only. It may contain proprietary material, confidential information and/or be subject to legal privilege. It should not be copied, disclosed to, retained or used by, any other party. If you are not an intended recipient then please promptly delete this e-mail and any attachment and all copies and inform the sender. Thank you.

  

_______________________________________________ cobbler-devel mailing list cobbler-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/cobbler-devel

I am having trouble applying these as well.     Can you rebase and resubmit?

As mentioned before, using github or having an external git tree seems to make merging much easier than "git am", and seems to result in less conflicts.  I do not generally get conflicts, for instance, when merging imeyer's or shenson's (etc) repos.   I'm not entirely sure /why/ but it just seems to work very very well.

--Michael