Re: Odd merge behaviour involving reverts
On Thursday 2008 December 18 17:25:34 Alan wrote:
Show 9 quoted lines
> Here is my situation...
>
> I have a master branch. We have a branch off of that that some
> developers are doing work on. They claim it is ready. We merge it into
> the master branch. It breaks something so we revert the merge. They
> make changes to the code. they get it to a point where they say it is
> ok and we merge again.
>
> What am i doing wrong here?
Don't do tests on the master branch. Or at least, do as little as possible. Also, try not to revert merges. Depending on your workflow and team synamics it might be easier to rewrite history than wrangle reverts of a merge commit.
--
Boyd Stephen Smith Jr. ,= ,-_-. =.
bss@iguanasuicide.net ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-'
http://iguanasuicide.net/ \_/
Boyd Stephen Smith Jr. <bss@iguanasuicide.net>