d/ozsh
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Better update process #2

New Issue
Open
opened 2021-03-08 10:53:12 +00:00 by d · 0 comments
d commented 2021-03-08 10:53:12 +00:00
Owner
Copy Link

git stash pop screws up the original file on conflict

Save conflict in a diff file and prompt the user instead.

git stash pop screws up the original file on conflict Save conflict in a diff file and prompt the user instead.
d added this to the 'Robust' Update milestone 2021-03-08 10:53:12 +00:00
d added the
enhancement
 label 2021-03-08 10:53:12 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No Label
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No Milestone
'Robust' Update
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: d/ozsh#2
No description provided.
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?