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

command for merging updates from base branch #74

Closed
rarkins opened this issue Nov 12, 2014 · 4 comments
Closed

command for merging updates from base branch #74

rarkins opened this issue Nov 12, 2014 · 4 comments
Labels
feature
Milestone
move to feature b...

Comments

@rarkins
Copy link

rarkins commented Nov 12, 2014

As a policy, we ask developers to merge updates from the base branch (e.g. master) prior to submitting or resubmitting a PR for review. Due to merge squashing, it won't matter how many messy merge commits come, so this is good practice for a project where people are committing things that don't cause merge conflict but could still cause problems. A reflow command for this would be good.
@codenamev
Copy link
Collaborator

That's a great idea. I think this should be built into the review command. @nhance anything against pulling up master during review?

@rarkins
Copy link
Author

rarkins commented Dec 3, 2014

@codenamev It would be good to have it as a part of review but also accessible on its own. i.e. a developer knows that a major update was made to mainline, it will break his branch, so he needs to merge and then fix before continuing.

@codenamev codenamev mentioned this issue Aug 5, 2015
Closed
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 15, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
4d3d0c4
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 15, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
e314653
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 15, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
3f58e31
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 15, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
2d3ab96
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 15, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
eabba85
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 15, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
09231bb
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 15, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
ed452ad
@codenamev
Copy link
Collaborator

[164] [Issue #66 + #74] Implementing "Git Reflow Refresh"

@pboling pboling mentioned this issue Apr 18, 2016
Merged
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 18, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
150f8f7
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 18, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
ba8f582
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 18, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
829c504
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 18, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
0bd7b7b
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 18, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
a502aed
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 18, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
ee2996b
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 18, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
30116ac
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 18, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
e494482
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 19, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
130be7a
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 19, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
4e5911d
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 20, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
2a02117
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 20, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
9984f90
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 20, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
66648ac
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 20, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
d5df53b
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 20, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
84b80e5
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 20, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
66ceb6f
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 20, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
75e427d
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 20, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
82bca7f
simonzhu24 added a commit to simonzhu24/gitreflow that referenced this issue Apr 21, 2016
@simonzhu24
[Issue reenhanced#66 + reenhanced#74] Implementing "Git Reflow Refresh"
86843b3
codenamev pushed a commit that referenced this issue Apr 21, 2016
@simonzhu24 @codenamev
[#66, #74] Introduces git-eflow-refresh to update feature branches
f275c71 
Fixes 66
Fixes 74
Closes 164

LGTM given by: @codenamev
@codenamev
Copy link
Collaborator

Fixed in v0.8.0 with 3b44510. git reflow refresh 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
feature
Projects
None yet
Milestone
move to feature branch rebasing
Development

No branches or pull requests
2 participants
@codenamev @rarkins