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

merge_collab tool #5

Open
joshmoore opened this issue Nov 2, 2012 · 0 comments
Open

merge_collab tool #5

joshmoore opened this issue Nov 2, 2012 · 0 comments
Labels
enhancement New feature or request

Comments

@joshmoore
Copy link
Member

Scenario: two developers are working tightly (simultaneously) on a single branch. Pushing commits quickly. Often they will be push -fing and similar. They need a tool to keep the branch properly rebased.

Solution: There should be a scc command to rebase/merge the two branches taking all of my commits from my branch, and all of my colleague's commits from my colleague's branch (in the right order)
snoopycrimecop pushed a commit to snoopycrimecop/snoopycrimecop that referenced this issue Feb 11, 2013
@joshmoore
Merge pull request ome#5 from sbesson/auto-submods
0ce981d 
rmerge() now returns an updated status boolean
@sbesson sbesson added the enhancement New feature or request label Feb 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
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@joshmoore @sbesson