search

jywarren / woofmark

:dog2: Barking up the DOM tree. A modular, progressive, and beautiful Markdown and HTML editor
http://bevacqua.github.io/woofmark
MIT License
3 stars 5 forks source link

Latest changes of bevacque #10

Closed NitinBhasneria closed 4 years ago

NitinBhasneria commented 4 years ago

This PR is for making the jywarren/woofmark branch plots2 up to date with bevacque/woofmark branch master.

NitinBhasneria commented 4 years ago

@jywarren here it is. Well, I cant see the resolve conflicts option may be due to rights issues.

jywarren commented 4 years ago

Ah, well, i think it's because it can't figure out how to auto-resolve them. I guess perhaps we should've done this first, but it's OK -- we can do 2 things -- try to simply rebase this over our plots2 branch, OR try to rebase the plots2 branch over this. I think without too many changes yet it's not going to be /too/ hard either way, but would you like to give one of the two a try?

Thank you, Nitin!

NitinBhasneria commented 4 years ago

Ah, well, i think it's because it can't figure out how to auto-resolve them. I guess perhaps we should've done this first, but it's OK -- we can do 2 things -- try to simply rebase this over our plots2 branch, OR try to rebase the plots2 branch over this. I think without too many changes yet it's not going to be /too/ hard either way, but would you like to give one of the two a try?

Thank you, Nitin!

I think we should rebase the plots2 branch over this as we know how our changes work and so we can easily do this. Yea, I will give a try this way. Also, should we close this PR?

jywarren commented 4 years ago

Well, if you can rebase and force push here maybe that can work? Give it a try otherwise feel free to open a new one and link from here.

Also, it's Sunday! Consider taking the day off! :-)

On Sun, Jul 12, 2020, 1:11 PM Nitin Bhasneria notifications@github.com wrote:

Ah, well, i think it's because it can't figure out how to auto-resolve them. I guess perhaps we should've done this first, but it's OK -- we can do 2 things -- try to simply rebase this over our plots2 branch, OR try to rebase the plots2 branch over this. I think without too many changes yet it's not going to be /too/ hard either way, but would you like to give one of the two a try?

Thank you, Nitin!

I think we should rebase the plots2 branch over this as we know how our changes work and so we can easily do this. Yea, I will give a try this way. Also, should we close this PR?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/jywarren/woofmark/pull/10#issuecomment-657250610, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAAF6J5E6UNQRE3GCPTMFTDR3HVELANCNFSM4OX35SRA .

NitinBhasneria commented 4 years ago

Well, if you can rebase and force push here maybe that can work? Give it a try otherwise feel free to open a new one and link from here. Also, it's Sunday! Consider taking the day off! :-)

I will give it a try and will update you with the same.

NitinBhasneria commented 4 years ago

@jywarren as this PR does not contain any of my branches, I can't edit the file changed in this PR. I have to open other PR with my branch so that I can edit and resolve the conflicts. Is it ok?

jywarren commented 4 years ago

Sure! Thank you!

On Sun, Jul 12, 2020 at 2:02 PM Nitin Bhasneria notifications@github.com wrote:

@jywarren https://github.com/jywarren as this PR does not contain any of my branches, I can't edit the file changed in this PR. I have to open other PR with my branch so that I can edit and resolve the conflicts. Is it ok?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/jywarren/woofmark/pull/10#issuecomment-657255264, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAAF6JZM4UGTJXFTJTNOWRLR3H2SDANCNFSM4OX35SRA .