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.

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

467 line spacing issue causes issues with certain scripts #469

Conversation

kvchitrapu
Copy link
Collaborator

No description provided.

@kvchitrapu kvchitrapu requested a review from akprasad March 1, 2023 03:29
@kvchitrapu kvchitrapu closed this Mar 1, 2023
@shreevatsa
Copy link
Contributor

(See comment on #467 (comment))

BTW this PR too has commits from other PRs. I think I figured out why: if you see https://github.com/kvchitrapu/ambuda/commits/main it already already has these commits:

image

so I think you need to create new feature branches starting from a "clean" main (or just starting from 10cf5fd which is currently the latest one already merged into ambuda-org:main).

@kvchitrapu
Copy link
Collaborator Author

Yeah! Every new branch needs git fetch -a prune && git pull && git reset --hard upstream/main. I forgot to run that with this branch.

@shreevatsa
Copy link
Contributor

Yeah! Every new branch needs git fetch -a prune && git pull && git reset --hard upstream/main. I forgot to run that with this branch.

For what it's worth, and just sharing because git is fun to think about (:P), that's not the only way: you could also do something like:

  • (One time) create a new branch called say clean and run the above command just once (resetting to upstream/main). Or this can just be the main branch after your changes on it get merged. Don't make any further changes to that branch (except optionally git pull)
  • For any new changes (before starting a new branch),
    • first go to the clean branch (git switch clean or git checkout clean), and then
    • create the new branch from there (git switch -c new_feature or git checkout -b new_feature)

But yeah anything that works will do :)

@kvchitrapu
Copy link
Collaborator Author

kvchitrapu commented Mar 2, 2023

@shreevatsa, thanks for this idea. Makes sense. I'll try it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants