search

paul-shannon / slexil

Software Linking Elan Xml to Illuminated Language
MIT License
0 stars 1 forks source link

consolidate branches #33

Closed davidjamesbeck closed 5 years ago

davidjamesbeck commented 5 years ago

would like to merge my last fixes with the master/origin branch and get off the workflow control branch

davidjamesbeck commented 5 years ago

Thanks. Now, I believe, I make sure that I checkout the master branch locally so that the workflow control branch doesn’t get continued?

David

On May 27, 2019, at 12:12 PM, Paul Shannon notifications@github.com wrote:

Merged #33 https://github.com/paul-shannon/slexil/pull/33 into master.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/paul-shannon/slexil/pull/33?email_source=notifications&email_token=AKN4HBRKFMDBOOVLEPSAYFDPXQP7XA5CNFSM4HP5PFUKYY3PNVWWK3TUL52HS4DFWZEXG43VMVCXMZLOORHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZGORVBO4RI#event-2369973829, or mute the thread https://github.com/notifications/unsubscribe-auth/AKN4HBVK3NEATK2OCIQBCKLPXQP7XANCNFSM4HP5PFUA.

paul-shannon commented 5 years ago

Yes: git checkout master

If I were you, I’d be inclined now to work in the master branch most of the time - indeed all the time, unless you are developing new features which won’t work with the code base in master. You can always rollback to a previous release if you end up in a chaotic situation.

On May 27, 2019, at 11:13 AM, David Beck notifications@github.com wrote:

Thanks. Now, I believe, I make sure that I checkout the master branch locally so that the workflow control branch doesn’t get continued?

David

On May 27, 2019, at 12:12 PM, Paul Shannon notifications@github.com wrote:

Merged #33 https://github.com/paul-shannon/slexil/pull/33 into master.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/paul-shannon/slexil/pull/33?email_source=notifications&email_token=AKN4HBRKFMDBOOVLEPSAYFDPXQP7XA5CNFSM4HP5PFUKYY3PNVWWK3TUL52HS4DFWZEXG43VMVCXMZLOORHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZGORVBO4RI#event-2369973829, or mute the thread https://github.com/notifications/unsubscribe-auth/AKN4HBVK3NEATK2OCIQBCKLPXQP7XANCNFSM4HP5PFUA.

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub, or mute the thread.