Re: [Beaker-devel] To merge into master
On 12/17/2009 11:44 PM, Raymond Mancy wrote:
Hi Bill, when you get a chance can you merge ticket543788 into
master. There were a lot changes in this branch.
Once this has been merged into master I have some other branches that will be tricky to
merge in, so I will first merge a copy of master into them and then put them
up for you to test and put into the master branch.
Cheers
Raymond
Hi Raymond,
This branch did not merge cleanly. so rather then screw up our newly
created branches I opted to create a patch and apply that to a new
branch called newticket543788. I then applied that to master and then
updated Scheduler.
% git checkout master
% git pull . newticket543788
% git checkout Scheduler
% git pull . master
Now master and Scheduler have the fix.
I think its all good.. but can you check things? I'm guessing you may
need to do the same thing for your custom columns. But any *NEW*
branches created from now on should be good.
Thanks for bearing with me.