search

johnpierson / RhythmForDynamo

A collection of nodes for use in Dynamo with Revit.
BSD 3-Clause "New" or "Revised" License
108 stars 25 forks source link

Need confirm process to update #66

Closed chuongmep closed 10 months ago

chuongmep commented 10 months ago

Hi @johnpierson, is your are resolving conflict between branch master and branch dev?

johnpierson commented 10 months ago

We are going to have to recreate the dev branch. The changes you made were a bit premature, unfortunately, resulting in far too many conflicts between my other branch that I was working on.

I understand if you do not want to redo the work, but that is where we are/

johnpierson commented 10 months ago

If you are willing to still contribute, please base all changes off of this new dev branch:

https://github.com/johnpierson/RhythmForDynamo/tree/dev

chuongmep commented 10 months ago

Thank you for you informaton, I will consider remodify when I have time to colaborate , need re work all now.

johnpierson commented 10 months ago

Thanks again! Sorry about that, but there was far too much work on my end that was going lost.

chuongmep commented 10 months ago

No worries @johnpierson , I don't think it is hard with me,

johnpierson commented 10 months ago

Hey @chuongmep future pull requests need to be from scratch. Not merely pointing at the new master with the 137 changed files. Please start a fresh branch if you want to do this still. Your PR as is, is breaking way too much stuff on my end.

If future commits are not new, with less commits, they will be closed.