search

openlcb / documents

The OpenLCB specification: standards, recommended practices and other documentation.
3 stars 7 forks source link

MtiAllocation.ods and .pdf update to include Event with Payload changes #95

Closed dpharris closed 1 year ago

dpharris commented 1 year ago

Event with Payload was recently added. The summary chart of MTIs and messages is updated to include these.

bobjacobsen commented 1 year ago

The changes are OK, but the files are showing conflicts that need to be resolved. Did you start with the most recent master?

dpharris commented 1 year ago

Probably not. I forgot to git pull.

Do I start again, or can I fix it?

David

On Mon, Nov 20, 2023 at 2:35 PM Bob Jacobsen @.***> wrote:

The changes are OK, but the files are showing conflicts that need to be resolved. Did you start with the most recent master?

— Reply to this email directly, view it on GitHub https://github.com/openlcb/documents/pull/95#issuecomment-1819913767, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAEDQSVDPDKZ6DIYKB23A3DYFPLKHAVCNFSM6AAAAAA7TH34PSVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQMJZHEYTGNZWG4 . You are receiving this because you authored the thread.Message ID: @.***>

bobjacobsen commented 1 year ago

I don't know of a safe way to fix this, where "safe" is defined as guaranteed to not lose any changes that were made between where your branch diverged and the current head of the master branch. I think those changes exist, because that's what made the conflict. So unfortunately, I think you have to start over with a new branch from master. Sorry for the trouble.

dpharris commented 1 year ago

No problem, I understand. David

On Mon, Nov 20, 2023 at 5:45 PM Bob Jacobsen @.***> wrote:

I don't know of a safe way to fix this, where "safe" is defined as guaranteed to not lose any changes that were made between where your branch diverged and the current head of the master branch. I think those changes exist, because that's what made the conflict. So unfortunately, I think you have to start over with a new branch from master. Sorry for the trouble.

— Reply to this email directly, view it on GitHub https://github.com/openlcb/documents/pull/95#issuecomment-1820080787, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAEDQSS3ENVUR3D7ND5XWGTYFQBUBAVCNFSM6AAAAAA7TH34PSVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQMRQGA4DANZYG4 . You are receiving this because you authored the thread.Message ID: @.***>

dpharris commented 1 year ago

I have submitted a new pull request. Will see if there are conflicts. Can I kill the previous one, or let it languish?

David

On Mon, Nov 20, 2023 at 7:29 PM David Harris @.***> wrote:

No problem, I understand. David

On Mon, Nov 20, 2023 at 5:45 PM Bob Jacobsen @.***> wrote:

I don't know of a safe way to fix this, where "safe" is defined as guaranteed to not lose any changes that were made between where your branch diverged and the current head of the master branch. I think those changes exist, because that's what made the conflict. So unfortunately, I think you have to start over with a new branch from master. Sorry for the trouble.

— Reply to this email directly, view it on GitHub https://github.com/openlcb/documents/pull/95#issuecomment-1820080787, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAEDQSS3ENVUR3D7ND5XWGTYFQBUBAVCNFSM6AAAAAA7TH34PSVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQMRQGA4DANZYG4 . You are receiving this because you authored the thread.Message ID: @.***>

bobjacobsen commented 1 year ago

96 looks good. I think you can close this one.