[ 
https://issues.apache.org/jira/browse/YUNIKORN-1262?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Wilfred Spiegelenburg resolved YUNIKORN-1262.
---------------------------------------------
    Fix Version/s: 1.1.0
       Resolution: Fixed

update merged: changes are properly stashed and applied again when the branch 
worked on is dirty

> stash local changes in merge_perge.sh
> -------------------------------------
>
>                 Key: YUNIKORN-1262
>                 URL: https://issues.apache.org/jira/browse/YUNIKORN-1262
>             Project: Apache YuniKorn
>          Issue Type: Bug
>          Components: release
>            Reporter: Wilfred Spiegelenburg
>            Assignee: Wilfred Spiegelenburg
>            Priority: Major
>              Labels: pull-request-available
>             Fix For: 1.1.0
>
>
> The merge_pr script does not stash local changes before starting its work. 
> This has the side effect that if you cancel the merge the local changes are 
> lost.
> Stashing and un-stashing local changes is the way to go



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to