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

feat: updated Readme.md + fixing application node bug #193

Merged
merged 3 commits into from
Dec 29, 2023

Conversation

SumantxD
Copy link
Contributor

@SumantxD SumantxD commented Dec 17, 2023

  • demonstrated how to operate the simulator GUI
  • fixed the error with the subscribe node that occurred while creating flow elements from the yaml file

@SumantxD SumantxD changed the title feat: Updated Readme.md feat: updated Readme.md Dec 17, 2023
@SumantxD SumantxD changed the title feat: updated Readme.md feat: updated Readme.md + fixing application node bug Dec 19, 2023
@NektariosFifes
Copy link
Collaborator

NektariosFifes commented Dec 19, 2023

hey as you can see in the pull request
there are commits that have already been merged
so this commit overides them
after a new pull request is merged in the main asyncapi/simulator repo make sure to
1 update the master branch in your fork
2 rebase the branch in your fork with the master of your fork
3 or delete the branch as it has been merged and create a new one
I think it is important for our repo to have a clean commit history so as to not get things confused later on. It is a good habit cause when things get more complicated there might be issues where we cant revert , etc...
so your latest pull request must have only the 2 latest commits you made
you can do that by updating your fork , fetching your fork locally with git fetch (--all)
then from your local master branch you need to create a new branch then copy the changes from your current branch

we can have as many branches as we want and each one shows a pull request we tried to do
later on we can delete these if we want or not

Steps to fix that with rebasing without creating new branch
and cherry picking:


i have the problematic branch checked out (sumant)
what i do after having checked it out is git rebase to master which is updated correctly

then i do accept yours to all promts a i do not want to modify the past commits (they have already been merged)

now i have the new branch rebased on the latest master commit
but i dont want all the commit history
i drop them and then i --force push the branch changes
--force is needed to overwrite commit history
now i have the same stuff without creating a new branch

Using rebase offers a lot of flexibility as it allows along with squash and drop to keep commit history in one tree and not have 100 of them. With rebase you change history as you want. why is this important? sometimes branches have branches which have more branches etc. being able to rebase is very important to make sure we dont have too may of them.

@NektariosFifes
Copy link
Collaborator

good job

@NektariosFifes NektariosFifes self-requested a review December 24, 2023 00:02
README.md Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
Copy link

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@NektariosFifes NektariosFifes merged commit 0a6fcde into asyncapi:master Dec 29, 2023
9 checks passed
@asyncapi-bot
Copy link
Contributor

🎉 This PR is included in version 0.12.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

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

Successfully merging this pull request may close these issues.

3 participants