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

Fix "-split" option issues on sct_image #1627

Merged
merged 1 commit into from
Mar 26, 2018
Merged

Conversation

fperdigon
Copy link
Contributor

@fperdigon fperdigon commented Mar 1, 2018

Description of the Change

With the option "-split" the code of line 274 must be executed.
The error was due to a failure in the flow control that executed the code of line 262.

Fixes #1556

@fperdigon fperdigon changed the title Fix the bug related on #1556 Bug Fix Mar 1, 2018
@zougloub
Copy link
Contributor

zougloub commented Mar 1, 2018

@fperdigon are you intending to merge into master or into poq_issue_1507_progress?

Your branch was developed from another baseline branch (poq_issue_1507_progress).
If master, could you try to rebase your branch (having a single commit) on top of the master branch?

This should work with:

git fetch
git rebase --onto origin/master origin/poq_issue_1507_progress fperdigon_issue1556
git push origin fperdigon_issue1556 --force

Thanks!

Copy link
Contributor

@zougloub zougloub left a comment

Choose a reason for hiding this comment

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

Just making sure that we won't make this before knowing the intent.

@fperdigon fperdigon closed this Mar 2, 2018
@fperdigon fperdigon deleted the fperdigon_issue1556 branch March 2, 2018 00:34
@jcohenadad
Copy link
Member

@fperdigon why did you close this PR?

@fperdigon fperdigon restored the fperdigon_issue1556 branch March 2, 2018 01:19
@fperdigon fperdigon reopened this Mar 2, 2018
@fperdigon
Copy link
Contributor Author

sorry, my mistake

@jcohenadad
Copy link
Member

as discussed in SCT meeting @fperdigon please:

  • update title of this PR
  • start from master branch

@fperdigon
Copy link
Contributor Author

Hollo @zougloub please a little help here. I ran the commands you told me and now a lot of commits that are not mine appear

@zougloub zougloub changed the base branch from poq_issue_1507_progress to master March 26, 2018 15:17
Copy link
Contributor

@zougloub zougloub left a comment

Choose a reason for hiding this comment

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

You did the right thing : only one commit from the master base. Only github wasn't aware of that yet. I changed the base and now github is happy too.

@fperdigon fperdigon changed the title Bug Fix Fix "-split" issues on sct_image Mar 26, 2018
@fperdigon fperdigon changed the title Fix "-split" issues on sct_image Fix "-split" option issues on sct_image Mar 26, 2018
@fperdigon
Copy link
Contributor Author

Yes, sure it was github web interface issue, now everything looks good, thanks @zougloub

@fperdigon fperdigon merged commit 2e56014 into master Mar 26, 2018
@peristeri peristeri deleted the fperdigon_issue1556 branch March 26, 2018 18:24
@jcohenadad jcohenadad added this to the 3.2.0 milestone May 29, 2018
@jcohenadad jcohenadad added the bug category: fixes an error in the code label May 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug category: fixes an error in the code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants