Skip to content

Conversation

@jima72
Copy link

@jima72 jima72 commented Feb 3, 2021

No description provided.

@Csantucci Csantucci mentioned this pull request Feb 16, 2021
@Csantucci
Copy link
Owner

I have resolved the conflicts. Thanks to César for the hint.

@cesarBLG
Copy link

It's OK now I think.

@jima72 If you want to do more changes to this PR, you have to do git pull CruiseControl so your local copy gets updated with Carlo's changes, and then perform a git push. However, in order to not have more merge conflicts, it's better that only one of you works on this at the same time.

@Csantucci If Jindrich pushes more commits, you can either merge this PR and let him open another one if he wants more changes, or you can use the method you just used but the other way round (merging pulls/CruiseControl into your cruise-control local branch). Either way github and git will recognize the code as merged, and less conflicts will appear.

@jima72
Copy link
Author

jima72 commented Feb 16, 2021

Hi. I have new code that takes a week to complete, will push it later today as it already is tested and working. Let's see what all goes broken.
Later we should cooperate with Carlo, so that no changes are done to the base until I commit my work.

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.

3 participants