[katello-devel] Important: Katello: propose pushing 'engine' branch to 'master'

[Walden Raines]

Wouldn't merging engine back into master be easier as far as conflict resolution goes?  Merging would also allow you to open a PR and for us to review/test before it goes back into master.  

I personally like rebasing for local development or while in a feature branch but prefer merging the feature branch back into master when complete.

Either way, I'm definitely in favor of getting the engine branch back into master soon.

Cheers,
Walden


----- Original Message -----
From: "Brad Buckingham" <bbuckingham at redhat.com>
To: katello-devel at redhat.com, foreman-dev at googlegroups.com
Sent: Tuesday, December 3, 2013 9:31:07 AM
Subject: [katello-devel] Important: Katello: propose pushing 'engine' branch	to 'master'

Katello Developers,

After the engine -> devel rebase, we should all now be working out of 
the engine branch.

Yesterday in our scrum, we discussed whether we should move the engine 
branch to master.  The general feedback was 'yes'.

In order to do this, we will probably have to:

1. force push, the engine branch in to master

afterwards,
2. any open PR against master, will need to be updated to be based on 
the new code in master (i.e. engine-base code)
3. any open PR against engine, will need to be updated to merge to 'master'

I assume that we want to do this sooner than later, so I propose that we 
plan for this to occur first thing tomorrow morning (e.g. 8am EST).

Does the team agree with this approach/plan?
(Feel free to offer other suggestions, if there is a better one than 
force pushing)

thanks,
Brad

_______________________________________________
katello-devel mailing list
katello-devel at redhat.com
https://www.redhat.com/mailman/listinfo/katello-devel