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

Alias function (errors) #69

Merged
merged 9 commits into from
Jul 24, 2024
Merged

Alias function (errors) #69

merged 9 commits into from
Jul 24, 2024

Conversation

2sumithrasuresh
Copy link
Collaborator

Alias function works but exits out of psh loop when called

@tejas-techstack
Copy link
Contributor

image

@g-anupam
Copy link
Contributor

This branch now has a merge conflict due to another PR being merged. @tejas-techstack is the bug fixed?

@tejas-techstack
Copy link
Contributor

uh ill try fixing the conflicts for now but i dont think the bug has been fixed yet, atleast i havent gotten an update about the bug fix

@polarhive polarhive linked an issue Jul 24, 2024 that may be closed by this pull request
@polarhive
Copy link
Collaborator

polarhive commented Jul 24, 2024

Mentors gonna work on this tomo, consider this PR closed apart from merge conflicts (bug fixes work on them after we resolve merge conflict or double work)

I'll cherrypick from git checkout a810a50c0e692d839cea06ad2ee553fbc9733232. This works when you comment out that return -1 at line 705.

Copy link
Collaborator

@polarhive polarhive left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merging this for now, tackle #80 in w5

@polarhive polarhive merged commit afd1745 into main Jul 24, 2024
@polarhive polarhive deleted the sumi branch July 24, 2024 21:37
adityatr64 pushed a commit that referenced this pull request Jul 25, 2024
* Alias function (errors)

* fixed bug

* Alias and Unalias function

* resolve conflict

* resolve conflict

* resolve conflict psh.h

* really trying to fix conflicts

* chore/fix: fix merge conflict

---------

Co-authored-by: Sumithra Suresh <2sumithra.suresh@gmail.com>
Co-authored-by: Tejas R <tejas.techstack@gmail.com>
Co-authored-by: Nathan Paul <mail@polarhive.net>
polarhive pushed a commit that referenced this pull request Jul 27, 2024
* Up arrow fix (#72)

* up, down, backspace works (fix mem leaks)

* added comments kbhit

* left & right arrow (fix mem leaks)

* Fixed some minor and major issues

* minor changes before leaving

* clear

* fixed

* comment

---------

Co-authored-by: Aditya/WIZ <pro.aditya.r@gmail.com>

* feat: alias function (#69)

* Alias function (errors)

* fixed bug

* Alias and Unalias function

* resolve conflict

* resolve conflict

* resolve conflict psh.h

* really trying to fix conflicts

* chore/fix: fix merge conflict

---------

Co-authored-by: Sumithra Suresh <2sumithra.suresh@gmail.com>
Co-authored-by: Tejas R <tejas.techstack@gmail.com>
Co-authored-by: Nathan Paul <mail@polarhive.net>

* added basic colors

* dynamic color choice (fix required)

Co-authored-by:AlaynaMonteiro <alaynamonteiro0907@gmail.com>

* script mode rewrite

* dynamic color choice (fix required)

Co-authored-by:AlaynaMonteiro <alaynamonteiro0907@gmail.com>

Co-authored-by:Aditya/WIZ <pro.aditya.r@gmail.com>

* fixed path of pshrc

Co-authored-by:AlaynaMonteiro <alaynamonteiro0907@gmail.com>

Co-authored-by:Aditya/WIZ <pro.aditya.r@gmail.com>

* syntax highlighting

* handling pshrc

* commented loading pshrc

---------

Co-authored-by: Aditya/WIZ <pro.aditya.r@gmail.com>
Co-authored-by: Sumithra Suresh <2sumithra.suresh@gmail.com>
Co-authored-by: Alayna Monteiro <alaynamonteiro0907@gmail.com>
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.

command: alias/unalias
4 participants