Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added community meeting minutes for 06-13-2018 #1225

Closed
wants to merge 2 commits into from

Conversation

mjturek
Copy link
Contributor

@mjturek mjturek commented Jun 13, 2018

No description provided.

@duck-rh
Copy link
Contributor

duck-rh commented Jul 18, 2018

@rainleander what do you expect us to do on this ticket?
All I see is a change by @mjturek which needs to be rebased and conflicts resolved. I tried to use the "resolve conflicts" function but to no avail. With just one line of change @mjturek should not have much difficulty.

@rainleander
Copy link
Contributor

It looks like it should just work? I don't know why it won't let me.

@duck-rh
Copy link
Contributor

duck-rh commented Jul 18, 2018

@rainleander git does not know how to merge these changes because the file has already been changed in master around the same line. I sent you some notes on how to solve a conflict. ANyway as I said @mjturek should do it on his branch and then we can merge.

@rainleander
Copy link
Contributor

Hello Mike! Could you please resolve this conflict so that it can be merged? Let me know if you need any assistance.

@rainleander
Copy link
Contributor

Cherry picked this update into my pull request [1239] for yesterday's meeting.

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.

None yet

4 participants