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.

Sign up for GitHub

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

Jump to bottom

Add feature to optionally correct branches on sync #370

Merged
merged 1 commit into from
Oct 28, 2022
Merged

Add feature to optionally correct branches on sync #370

merged 1 commit into from
Oct 28, 2022

Conversation

gdubicki
Copy link
Member

@gdubicki gdubicki commented Oct 1, 2022 •
edited
Loading

but only when the repo is clean.

Partially implements #286

@gdubicki gdubicki mentioned this pull request Oct 1, 2022
Open
@gdubicki gdubicki force-pushed the optionally-change-branch branch from 5f4d40a to 3229d20 Compare October 2, 2022 09:52
@dmerejkowsky
Copy link
Collaborator

dmerejkowsky commented Oct 10, 2022 •
edited
Loading

I find it weird that this is an option in the manifest ... I was expecting an other tsrc sub-command or a flag in tsrc sync

@gdubicki
Copy link
Member Author

I find it weird that this is an option in the manifest ... I was expecting an other tsrc sub-command or a flag in tsrc sync

You are right. If this is in manifest then it's forced on all of its users, while a sub-command or a flag makes it a user's choice.

I propose to switch this to a flag like tsrc sync [-c/--correct-branch]. Ok, @dmerejkowsky?

@dmerejkowsky
Copy link
Collaborator

I propose to switch this to a flag like tsrc sync [-c/--correct-branch]. Ok, @dmerejkowsky?

Sounds good. Go for it :)

@gdubicki gdubicki force-pushed the optionally-change-branch branch 2 times, most recently from 82ffa6d to 0558db9 Compare October 21, 2022 12:28
@gdubicki gdubicki changed the title Add feature to optionally checkout configured branches on sync, when … Add feature to optionally correct branches on sync Oct 21, 2022
@gdubicki gdubicki force-pushed the optionally-change-branch branch 3 times, most recently from 60d0ffa to 07ff6fb Compare October 21, 2022 12:36
@gdubicki gdubicki force-pushed the optionally-change-branch branch from 07ff6fb to 68b708d Compare October 21, 2022 12:37
@gdubicki gdubicki marked this pull request as ready for review October 21, 2022 12:46
@gdubicki
Copy link
Member Author

I propose to switch this to a flag like tsrc sync [-c/--correct-branch]. Ok, @dmerejkowsky?

Sounds good. Go for it :)

Done. Can you please review?

@gdubicki
Copy link
Member Author

A gentle nudge, @dmerejkowsky ;)

@dmerejkowsky
Copy link
Collaborator

Looks good to me - let's merge this :)

@dmerejkowsky dmerejkowsky merged commit 9aefcf3 into your-tools:main Oct 28, 2022
@dmerejkowsky
Copy link
Collaborator

@gdubicki I think it would be nice to make sure you can publish tsrc releases on your own. Feel free to contact me so we can figure out the details.

@gdubicki gdubicki deleted the optionally-change-branch branch October 28, 2022 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gdubicki @dmerejkowsky