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.

Sign up for GitHub

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

Jump to bottom

git-elegant-accept-work:11-16: Alternative flows of... #146

Closed
0pdd opened this issue Jul 21, 2019 · 1 comment
Closed

git-elegant-accept-work:11-16: Alternative flows of... #146

0pdd opened this issue Jul 21, 2019 · 1 comment
Labels
feature help wanted

Comments

@0pdd
Copy link

0pdd commented Jul 21, 2019

The puzzle 137-b582b6a4 from #137 has to be resolved:

elegant-git/libexec/git-elegant-accept-work

Lines 11 to 16 in aa2fc0b

# @todo #137 Alternative flows of `accept-work`
# If this command is executed with `${WORK_BRANCH}` and
# 1. `git rebase` is in progress, it has to run `git rebase --continue` prior working with
# `${MASTER}` branch.
# 2. `git rebase` is completed (history of `${WORK_BRANCH}` and `${RMASTER}` are different),
# just work with `${MASTER}` branch.

The puzzle was created by @extsoft on 21-Jul-19.

role: DEV.

If you have any technical questions, don't ask me, submit new tickets instead. The task will be "done" when the problem is fixed and the text of the puzzle is removed from the source code. Here is more about PDD and about me.
0pdd referenced this issue Jul 21, 2019
@extsoft
Add accept-work command
aa2fc0b 
The command aims to merge a work branch in `master` one. It's similar to
what happen if you accept and merge a PR.

#137
@0pdd 0pdd mentioned this issue Jul 21, 2019
Closed
@extsoft extsoft added the feature label Sep 1, 2019
extsoft added a commit that referenced this issue Nov 30, 2019
@extsoft
Support active rebase process during accept-work execution
f6fc5ca 
It happens that there are conflicts during the rebase of the latest
upstream into current branch for acceptance. And once they are solved,
the `accept-work` execution one more time allows continuing current
rebase and accepting work. But if a rebase is initiated not by
`accept-work` command, the execution will fail with appropriate message.

#146
@0pdd
Copy link
Author

0pdd commented Dec 1, 2019

The puzzle 137-b582b6a4 has disappeared from the source code, that's why I closed this issue.

@0pdd 0pdd closed this as completed Dec 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
feature help wanted
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@extsoft @0pdd