Closed MalloZup closed 6 years ago
Hi, can i take this?
@jatin69 sure feel free to take experiment and open pr or issue! For any info ping me
Hi @MalloZup
In the time I was working on this, you merged someone's PR on the same topic.
Now my PR will have merge conflicts. Also, my fork is 2 commits behind in master
How should I approach this situation now?
What I think is possible :
I will sync my fork's master branch
with yours & then send a PR to my master branch from my feature branch, then resolve all conflicts, then squash history & PR to your repo.
Is that right? Please let I know the best way to resolve this.
Hi @jatin69 yop i would in your situation take all changes from upstream and rebase
Hi @MalloZup I did my best to resolve all the conflicts. Please check it out.
i consider it more or less closed ( since i accepted already 2 prs ) and other reviewed it before. !
Many thx :cupid:
This is about the easiest fix ever :smile: Go through doc and fix logical errors or typos